bodges and saves
separate hub classes
myriad bugfixes after refactoring
more stuffs
Merge branch 'Bodges'