Services WIP take 5
Services WIP take 5+
Merge pull request #2 from antidata/servicesWIP

Services wip