in the middle of a major refactoring