Added chapter 2 stuff