Finish chapter 3

Change-Id: I8f8cbae2c7b50ce6b92e77b2322d8a5328f3cd25