Updated classes

Blah
Merge pull request #1 from AmericanCommunist/master

Updated classes