Adding new classes from Ch3