Changed some stuff to fix classes
Changed some stuff to fix classes