Added multiple modes of control, gesture-switching