pretty much finished challenges 6 and 7