added some stuff going on with classes