changed to a model/dto (entity) architecture and updated multiple services, viewmodels, etc.