added ioc; service locator no longer in use, now ioc rule everythink