Temp commit of chapter 2.