WIP: The Simulacrum #106

Closed
max wants to merge 15 commits from pr-full-test into master

15 commits