Changed a bunch of stuff about what classes handle what actions. I'm pretty bad about regular commits...