Added some new classes and things!