Continued refactoring - will not compile