Began work on the more generic service locator implementation, which will replace the ServiceManager's functionality.