Added other bits from week 1 and 2