added solution to prob1 and some work on prob2