diff --git a/app/assets/javascripts/src/JIT.js.erb b/app/assets/javascripts/src/JIT.js.erb
index 7d8e1a11..d31d850c 100644
--- a/app/assets/javascripts/src/JIT.js.erb
+++ b/app/assets/javascripts/src/JIT.js.erb
@@ -2443,6 +2443,9 @@ Extras.Classes.Navigation = new Class({
   initializePost: function() {
     this.pos = false;
     this.pressed = false;
+    // START METAMAPS CODE
+    this.initDist = false;
+    // END METAMAPS CODE
   },
   
   onMouseWheel: function(e, win, scroll) {      
@@ -2585,7 +2588,120 @@ Extras.Classes.Navigation = new Class({
     
     // END METAMAPS CODE
     
+  },
+  
+  // START METAMAPS CODE
+  onTouchStart: function(e, win, eventInfo) {
+    if(!this.config.panning) return;
+    Metamaps.Mouse.changeInX = 0;
+    Metamaps.Mouse.changeInY = 0;
+    if((this.config.panning == 'avoid nodes' && eventInfo.getNode()) || eventInfo.getEdge()) return;
+    this.pressed = true;
+    var rightClick = e.button == 2 || (navigator.platform.indexOf("Mac") != -1 && e.ctrlKey); 
+    if (!Metamaps.Mouse.boxStartCoordinates && ((e.button == 0 && e.shiftKey) || (e.button == 0 && e.ctrlKey)  || rightClick)) {
+      Metamaps.Mouse.boxStartCoordinates = eventInfo.getPos();
+    }
+    Metamaps.Mouse.didPan = false;
+    this.pos = eventInfo.getPos();
+    var canvas = this.canvas,
+        ox = canvas.translateOffsetX,
+        oy = canvas.translateOffsetY,
+        sx = canvas.scaleOffsetX,
+        sy = canvas.scaleOffsetY;
+    this.pos.x *= sx;
+    this.pos.x += ox;
+    this.pos.y *= sy;
+    this.pos.y += oy;
+  },
+  
+  onTouchMove: function(e, win, eventInfo) {
+    if(!this.config.panning) return;
+    if(!this.pressed) return;
+    if(this.config.panning == 'avoid nodes' && (this.dom? this.isLabel(e, win) : eventInfo.getNode())) return;
+    
+    if (e.touches.length == 1) {
+      var rightClick = e.button == 2 || (navigator.platform.indexOf("Mac") != -1 && e.ctrlKey);
+      if (!Metamaps.Mouse.boxStartCoordinates && ((e.button == 0 && e.shiftKey) || (e.button == 0 && e.ctrlKey)  || rightClick)) {
+        Metamaps.Visualize.mGraph.busy = true;
+        Metamaps.boxStartCoordinates = eventInfo.getPos();
+        return;
+      }
+      if (Metamaps.Mouse.boxStartCoordinates && ((e.button == 0 && e.shiftKey) || (e.button == 0 && e.ctrlKey)  || rightClick)) {
+        Metamaps.Visualize.mGraph.busy = true;
+        Metamaps.JIT.drawSelectBox(eventInfo,e);
+        return;
+      }
+      if (rightClick){
+        return;
+      }
+      if (e.target.id != 'infovis-canvas') { 
+        this.pressed = false;
+        return;
+      }
+      Metamaps.Mouse.didPan = true;
+      var thispos = this.pos, 
+          currentPos = eventInfo.getPos(),
+          canvas = this.canvas,
+          ox = canvas.translateOffsetX,
+          oy = canvas.translateOffsetY,
+          sx = canvas.scaleOffsetX,
+          sy = canvas.scaleOffsetY;
+      currentPos.x *= sx;
+      currentPos.y *= sy;
+      currentPos.x += ox;
+      currentPos.y += oy;
+      var x = currentPos.x - thispos.x,
+          y = currentPos.y - thispos.y;
+      Metamaps.Mouse.changeInX = x;
+      Metamaps.Mouse.changeInY = y;
+      this.pos = currentPos;
+      this.canvas.translate(x * 1/sx, y * 1/sy);
+      jQuery(document).trigger(Metamaps.JIT.events.pan);
+    } 
+    /*
+    else if (e.touches.length == 2) {
+      var touch1 = e.touches[0]
+      var touch2 = e.touches[1]
+      var canvas = this.canvas
+      
+      callCount++;
+
+      var dist = Metamaps.Util.getDistance({
+        x: touch1.clientX,
+        y: touch1.clientY
+      }, {
+        x: touch2.clientX,
+        y: touch2.clientY
+      })
+
+      if (!this.initDist) {
+        this.initDist = dist
+        this.initScale = canvas.scaleOffsetX
+      }
+      var scale = (dist / this.initDist)
+      
+      document.getElementById("header_content").innerHTML = scale + ' ' + canvas.scaleOffsetX
+      if (30 >= this.initScale * scale && this.initScale * scale >= 0.2) {
+        canvas.scale(this.initScale * scale, this.initScale * scale)
+      }
+      if (canvas.scaleOffsetX < 0.5) {
+        canvas.viz.labels.hideLabels(true)
+      } else if (canvas.scaleOffsetX > 0.5) {
+        canvas.viz.labels.hideLabels(false)
+      }
+      
+      jQuery(document).trigger(Metamaps.JIT.events.zoom);
+    }
+    */
+  },
+  
+  onTouchEnd: function(e, win, eventInfo, isRightClick) {
+    if(!this.config.panning) return;
+    this.pressed = false;
+    if (Metamaps.Mouse.didPan) Metamaps.JIT.SmoothPanning();
+    this.initDist = false
   }
+  // END METAMAPS CODE
 });
 
 
diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index 852c1767..d5e82081 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@@ -337,26 +337,10 @@ Metamaps.JIT = {
           Metamaps.JIT.onDragCancelHandler(node, eventInfo, e, false)
         },
         // Implement the same handler for touchscreens
-        onTouchStart: function (node, eventInfo, e) {
-          Metamaps.Visualize.mGraph.events.touched = true
-
-          var canvas = Metamaps.Visualize.mGraph.canvas
-
-          Metamaps.Touch.touchPos = eventInfo.getPos()
-          Metamaps.Touch.touchPos.x *= canvas.scaleOffsetX
-          Metamaps.Touch.touchPos.y *= canvas.scaleOffsetY
-          Metamaps.Touch.touchPos.x += canvas.translateOffsetX
-          Metamaps.Touch.touchPos.y += canvas.translateOffsetY
-
-          touchDragNode = node
-        },
+        onTouchStart: function (node, eventInfo, e) {},
         // Implement the same handler for touchscreens
         onTouchMove: function (node, eventInfo, e) {
-          if (Metamaps.Touch.touchDragNode) {
-            Metamaps.JIT.onDragMoveTopicHandler(Metamaps.Touch.touchDragNode, eventInfo, e)
-          } else {
-            Metamaps.JIT.touchPanZoomHandler(eventInfo, e)
-          }
+          Metamaps.JIT.onDragMoveTopicHandler(node, eventInfo, e)
         },
         // Implement the same handler for touchscreens
         onTouchEnd: function (node, eventInfo, e) {},
@@ -734,54 +718,6 @@ Metamaps.JIT = {
     Metamaps.Control.deselectAllEdges()
     Metamaps.Control.deselectAllNodes()
   }, // escKeyHandler
-  touchPanZoomHandler: function (eventInfo, e) {
-    if (e.touches.length == 1) {
-      var thispos = Metamaps.Touch.touchPos,
-        currentPos = eventInfo.getPos(),
-        canvas = Metamaps.Visualize.mGraph.canvas,
-        ox = canvas.translateOffsetX,
-        oy = canvas.translateOffsetY,
-        sx = canvas.scaleOffsetX,
-        sy = canvas.scaleOffsetY
-      currentPos.x *= sx
-      currentPos.y *= sy
-      currentPos.x += ox
-      currentPos.y += oy
-      // var x = currentPos.x - thispos.x,
-      //    y = currentPos.y - thispos.y
-      var x = currentPos.x - thispos.x,
-        y = currentPos.y - thispos.y
-      Metamaps.Touch.touchPos = currentPos
-      Metamaps.Visualize.mGraph.canvas.translate(x * 1 / sx, y * 1 / sy)
-    } else if (e.touches.length == 2) {
-      var touch1 = e.touches[0]
-      var touch2 = e.touches[1]
-
-      var dist = Metamaps.Util.getDistance({
-        x: touch1.clientX,
-        y: touch1.clientY
-      }, {
-        x: touch2.clientX,
-        y: touch2.clientY
-      })
-
-      if (!lastDist) {
-        lastDist = dist
-      }
-
-      var scale = dist / lastDist
-
-      if (8 >= Metamaps.Visualize.mGraph.canvas.scaleOffsetX * scale && Metamaps.Visualize.mGraph.canvas.scaleOffsetX * scale >= 1) {
-        Metamaps.Visualize.mGraph.canvas.scale(scale, scale)
-      }
-      if (Metamaps.Visualize.mGraph.canvas.scaleOffsetX < 0.5) {
-        Metamaps.Visualize.mGraph.canvas.viz.labels.hideLabels(true)
-      } else if (Metamaps.Visualize.mGraph.canvas.scaleOffsetX > 0.5) {
-        Metamaps.Visualize.mGraph.canvas.viz.labels.hideLabels(false)
-      }
-      lastDist = dist
-    }
-  }, // touchPanZoomHandler
   onDragMoveTopicHandler: function (node, eventInfo, e) {
     var self = Metamaps.JIT