Mostly Done

This is the last push I made during the hackathon. It's still missing a few important bits that I forgot to push though. I'll recode them.