Initial commit, nearing end of chapter 2.