Added a few new classes and cleaned up the code