broken build - refactoring continued