Refactored away the static GL Stuff. And added a serviceLocator