finished problem 1 and 2 completely