Class Updates

Screwing around with classes