Getting closer to having the first unit test run

Restructured the base service class slightly.