In the middle of devastating refactoring