worked more on gestures, think i got it this time