commit before major build refactoring