Finished chapter 2 and chapter 3

Finished chapter 2 and chapter 3