Chapter 7 about halfway finished, chapter 4 edits