chapter 9

Still resolving conflicts