Adding in the class, looking spiffy