Updated task 3 and 3.1, now complete