Added Leap controller
Crappier code