Took the time to understand what's up in the classes, refactored out the ugly staticmethod stuff.