Finished most of task 2