Updated classes

Blah