WIP: touch events
Trying to merge Shane's changes
WIP: fixing merge
Merge complete