Made a lot of changes since the last commit. So I'm going to commit a bunch of changes, then be better about atomic commits.