mega update to classes

Reworked all classes.