#3 Implemented fully working ServiceLocator