Overhaul of service locator... now using dependency injection auto-resolving