Clean up
Refactor out the gesture detector
Ready to gogo