Converting the rest of the Model to the Repository pattern. Moving some of the non-Model into Utility, and generic spring cleaning.