Finshed chapter 3

Change-Id: I623dd57ea45840afb00043312d48dda98979885f