first commit of chapter 6 material