finished challenge 7 and challenge 8