Some work on chapter 8, but i feel like I need to go through chapter 7 again