most specs complete, moving to refactoring