Reworked chapter 2
added todofile for monday