Add more classes and stuff.