a good start on the repository refactor, lessons learned too