Committing because I'm done debugging for now.

 - Things are changing, which is good. Good place to commit
 - Things aren't changing the way they should, which is bad. We'll
make another commit :)