Finish Chapter 4

Change-Id: Ic01565ded75d06769ecc28c3d8ed9adc1f68a7af