unified the super_dis codebase a bit more
but encountered an error on class defs :(