Basic refactoring, plus a performance change or two.

Mostly shuffling things around here, for clarity reasons. The user model was getting to be a God Object, so I removed a lot of stuff from there specifically. Still need to clobber the entire summary classes.