Finished 4.2 with refactoring.
More refactoring.
Final refactoring before 4.2
Finished 4.3
Finished Chapter 4.
Refactoring.