challenges 6 and 7 solved