updated w/ problem 7 almost done