Did some work on task 7