Finish Chapter 5

Change-Id: I74a33f5587ada9ab0cccfc1364f415d8e08b0225