Final commit on chapter 8 jeeeeeeez