Chapter 7 finished

Change-Id: Ib661bab8a4d9bb188e388c5e02b6210deb5d122c