Saves changes made during the test build

We'll sort the code out into a more final state in the next few commits.