Changes from chapter 5
Things for chapter 6
Chapter 7 implemented