Will: "Updated my solution to fix the case that was failing.  I also refactored it a little to be more clear."