Chapter 2 almost complete