got more of problem 2 done