Moving methods out of Class and removing compStage genericity of Class; fixing all compile errors