commit before major refactoring