Addition of gesture support, need to integrate with settings
Merge branch 'gesture' into tweaks
Fixed tracking