Now done until Lesson 2 - Refactoring.