Finish problem 1 and 2