Task 7 complete
Task 8 nearly complete