The class rework should probably come first, that would make this tons easier (and less wasted effort that will get scrapped when I do)