WIP on Leap class