Finished chapter 16
merge