Pulled the shit out of classes that is now in the base class