a bunch of work on Chapter 2