Added partially completed chapter 17 and 18