Working on chapter 6
Moving stuff around
Moving other stuff around