Nearly finished with the basic implementation including the service registry.
Bug fixes for basic implementation