Added some new classes and changed a few things