UPDATE: Completed task 2