Refactor Model Services

Controllers, templates, services, tests, have all been updated. Tests all pass. It just works.