Added new classes and everything.