WIP refactored gestures