Lots of changes. I should probably learn to commit more often