Demo day cleanup

Here's enough to get the game to a playable state, I did each step in a separate commit that we can go over if you come early enough to demo day. It looks like I changed quite a bit, but that's only because I moved things around to re-organize it.