Added some more classes and a few other things