Commit before branching to do do a major refactoring.