Pulled some more superclasses up.
Made some more refactorings