Finish problem 1, part of 2