Add solution to problem 1 and some work on 2