refactoring 1
more refactoring
build off refactors