Progress on chapter 3.
Resolved conflicts.