BIG COMMIT. Adjust app to wirking with new ServiceLocator. CODE IS COMPILE AND WORKING NOW.