last commit before major OO refactor