Task 1-6 done