HTH: Chapter 17, first commit