Task 1 done

Task 2 Almost done