Task 1 and 2 are complete