chapter 7 finished merging this