Sprint 1 - commit 4

Got all service functionality working.