I have to submit this half complete cl in order to pull.
Idk why this is so big. I just merged some files.
Merge branch 'master' of https://github.com/tlhallock/potential-nemesis
Big refactor, and now it compiles again.