Finish Chapter 2 - set up work for Chapter 3