Even more progress, need better commit messages