task 6 and 7

Task 6 almost complete