--make / --remove

The protocol for testing this is complicated already and I'm already reasonably happy with how it's working so far, so I've combined --make and --remove into one big branch.