Added new class and made some minor edits in the other classes.