Initial attempt at gesture support