get main codebase to compile again - tests not there yet..