Worked a bit more on ch. 2