Chapter 2 almost done