Chapter 2 revisited. Closes #96.