task 6 & 7 wip