Finished with Chapter 6
Finished with Chapter 7
Fixed class names