First working version of both touch handlers working