Updated my solution to Bob, and created a solution for Leap.