Make all tests pass, woohoo! Also defeated epic battle with closures!