Class changes

Cause Harris told me to.