Finished task 2 and 3