Refactoring things back to 'Units' to allow for future more than just mechs
Merge remote-tracking branch 'origin/8th-cycle-prep' into 8th-cycle-prep
Moving to shortName indexing. Starting process of moving to units