final commit before refactoring for new database