Lesson 10 - Class updates
Merge