Chapter 1 revisited. Closes #94.