Comments added (week 1&2 100% done)