More refactoring - will not build