Started work towards gesture support