Moved functionality to GestureController