Addition of new classes
Working on the classes