Did chapter 2, added some scaffolding