Initial Real Commit. Need to Add Leap functionality