Updates to chapter 1... needs some work.