Completed task 3 and first part of task 2