Changed some stuff with a few classes.