Big commit, lots of untested stuff and things. Neat.