Finally adding some class

Pretty much everything is in a class now. Yay!