Chapter 2 almost-final commit