More work done on chapter 1