Add class

Finalized the add class stuff.