Broke out different classes for different services.  Also, added security checks to save service.