Added week 3 and fixed some stuff from last week