#11 Refactored gesture coordinator a bit to reduce duplication and fixed a regression