Start reshuffling the prototype
Move things into better places, and delete more stuff.
Knocking the main test into shape, one implicit at a time