Service

Checks pass, will continue to work on appropriate tests.