008.05 More initial codebase work - compiles again