Merge pull request #74 from nicksavers/repofactor

Performance and better separation of concerns