JFP-ifying Chapter 2.