Finished with work on the second class
STuff for class 3
Cleanup