next pass at renaming
continuing refactoring
compiling again