all of chapter 2

this is all the stuff i did in chapter 2