More Refactoring. It actually compiles now! Probably will blow up when run though. Can’t test until I port until Windows, as VMWare Player hates USB :/