Did some work on task 8