Chapter 6 pre-final commit.