Added all the old stuff from the class