First commit of chapter 7