Started refactoring out marjority of functionality to official
PluginLibrary AAR