WIP - knocking bugs out of newly structured plugin load/unload logic