Working on chapter 12
More chapter 12
Merge branch 'working'