Started adding some meat and potatoes to the repository class for new usage