continue working through refactoring repository