Modifications to Service, TestRepo, Starter classes plus a lot of
frustration \o/