Added Task 2 and partial Task 3