added new functionality to drive LanguageController and cleaned up imports