20141024: Problem 2 done-ish