Started work on problem 2, haven't yet tested it