Added some work for chapter 1