last commit before large refactoring