Intial work done for moving over to real services
Merge pull request #15 from conorfennell/real_services

Intial work done for moving over to real services