added a bunch of classes