Add solution to 2.16, that wraps up set 2!