Completed the final tasks for chapter 7