started integrating services.
TODO: More namespacing fixes, service additions, etc.