Dear yay this awful thing is working. Ish.
It works! It works! Crap, now I have to write the rest of it
Awful merge hack
Merge branch 'notmodular'