diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 12f9fdbba0..04f9b3e43a 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -30,7 +30,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
     var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ;
 
     var PROFILE = false;
-    var DEBUG = true;
+    var DEBUG = false;
 
     if (typeof Test !== "undefined") {
         PROFILE = true;
diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js
index 60a36ea06d..2d74bbe9ae 100644
--- a/scripts/system/controllers/controllerModules/equipEntity.js
+++ b/scripts/system/controllers/controllerModules/equipEntity.js
@@ -183,31 +183,62 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
 
 function EquipTimer(hand) {
     this.hand = hand;
+    this.timelapsed = 0;
     this.primaryTriggerPressed = false;
     this.secondaryTriggerPressed = false;
-    this.equipTime = EQUIP_TIME;
-    this.currentTimeLapse = 0;
-    this.equip = true;
+    this.targetTime = EQUIP_TIME;
     this.finished = false;
     this.circle3dProperties = CIRCLE_3D_PROPERTIES;
     this.circle3dOverlay = Overlays.addOverlay("circle3d", this.circle3dProperties);
 }
 
-EquipTimer.prototype.update = function(deltaTime, timestamp, controllerData) {
-    /*var TRIGGER_ON_VALUE = 0.105;
+EquipTimer.prototype.update = function(deltaTime, targetEntityID, controllerData) {
+    var TRIGGER_ON_VALUE = 0.105;
     var BUMPER_ON_VALUE = 0.5;
     var primaryTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE;
     var secondaryTriggerPressed = controllerData.secondaryValues[this.hand] > BUMPER_ON_VALUE;
 
     if (primaryTriggerPressed || secondaryTriggerPressed) {
-        if (primaryTriggerPressed === this.primaryTriggerPressed &&
-            */
+        if ((primaryTriggerPressed === this.primaryTriggerPressed) &&
+            (secondaryTriggerPressed === this.secondaryTriggerPressed)) {
+            this.timelapsed += deltaTime * 1000; // convert to ms
+            // update overlay
+
+            var entityProperties = Entities.getEntityProperties(targetEntityID, ["position", "rotation"]);
+            if (entityProperties) {
+                var PI = 3.14159;
+                var TWO_PI = PI * 2;
+                var FORWARD_OFFSET = 0.1 * MyAvatar.sensorToWorldScale;
+                var direction = Vec3.subtract(entityProperties.position - HMD.position);
+                var overlayPosition = Vec3.sum(entityProperties.position, Vec3.multiply(FORWARD_OFFSET, direction));
+            }
+            if (this.timelapsed >= this.targetTime) {
+                print("finished");
+                this.finished = true;
+            }
+
+            return;
+        }
+
+        this.reset();
+        this.primaryTriggerPressed = primaryTriggerPressed;
+        this.secondaryTriggerPressed = secondaryTriggerPressed;
+    } else {
+        this.reset();
+    }
 };
 
-EquipTimer.prototype.finished = function() {
+EquipTimer.prototype.done = function() {
     return this.finished;
 };
 
+EquipTimer.prototype.reset = function() {
+    this.finished = false;
+    this.timelapsed = 0;
+    this.primaryTriggerPressed = false;
+    this.secondaryTriggerPressed = false;
+};
+
 EquipTimer.prototype.cleanup = function() {
     Overlays.deleteOverlay(this.circle3dOverlay);
 };
@@ -324,6 +355,7 @@ EquipTimer.prototype.cleanup = function() {
         this.shouldSendStart = false;
         this.equipedWithSecondary = false;
         this.handHasBeenRightsideUp = false;
+        this.equipAtRun = false;
 
         this.parameters = makeDispatcherModuleParameters(
             300,
@@ -672,20 +704,23 @@ EquipTimer.prototype.cleanup = function() {
             }
 
             equipHotspotBuddy.update(deltaTime, timestamp, controllerData);
-            this.equiptTimer.update(deltaTime, timestamp, controllerData);
             // if the potentialHotspot is cloneable, clone it and return it
             // if the potentialHotspot os not cloneable and locked return null
 
             if (potentialEquipHotspot &&
-                (((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease &&
-                  this.equipTimer.finished()) || this.messageGrabEntity)) {
+                (((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease) || this.messageGrabEntity)) {
                 this.grabbedHotspot = potentialEquipHotspot;
                 this.targetEntityID = this.grabbedHotspot.entityID;
-                this.startEquipEntity(controllerData);
+                this.equipAtRun = true;
                 this.messageGrabEntity = false;
-                this.equipedWithSecondary = this.secondarySmoothedSqueezed();
+                if (this.messageGrabEntity) {
+                    this.startEquipEntity(controllerData);
+                    this.equipedWithSecondary = this.secondarySmoothedSqueezed();
+                    this.equipAtRun = false;
+                }
                 return makeRunningValues(true, [potentialEquipHotspot.entityID], []);
             } else {
+                this.equipAtRun = false;
                 return makeRunningValues(false, [], []);
             }
         };
@@ -706,6 +741,19 @@ EquipTimer.prototype.cleanup = function() {
             var timestamp = Date.now();
             this.updateInputs(controllerData);
 
+            if (this.equipAtRun) {
+                if ((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease) {
+                    this.equipTimer.update(deltaTime, this.targetEntityID, controllerData);
+                    if (this.equipTimer.done()) {
+                        this.equipAtRun = false;
+                        this.startEquipEntity(controllerData);
+                        this.equipedWithSecondary = this.secondarySmoothedSqueezed();
+                        this.equipTimer.reset();
+                    }
+                    return makeRunningValues(true, [], []);
+                }
+            }
+
             if (!this.isTargetIDValid(controllerData)) {
                 this.endEquipEntity();
                 return makeRunningValues(false, [], []);
diff --git a/scripts/system/controllers/controllerModules/highlightNearbyEntities.js b/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
index de58c5a388..2b9b79578f 100644
--- a/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
+++ b/scripts/system/controllers/controllerModules/highlightNearbyEntities.js
@@ -9,12 +9,13 @@
 /* global Script, Controller, RIGHT_HAND, LEFT_HAND, MyAvatar, getGrabPointSphereOffset,
    makeRunningValues, Entities, enableDispatcherModule, disableDispatcherModule, makeDispatcherModuleParameters,
    PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
-   DEFAULT_SEARCH_SPHERE_DISTANCE, getGrabbableData, makeLaserParams
+   DEFAULT_SEARCH_SPHERE_DISTANCE, getGrabbableData, makeLaserParams, entityIsCloneable
 */
 
 (function () {
     Script.include("/~/system/libraries/controllerDispatcherUtils.js");
     Script.include("/~/system/libraries/controllers.js");
+    Script.include("/~/system/libraries/cloneEntityUtils.js");
     var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
     function HighlightNearbyEntities(hand) {
         this.hand = hand;
@@ -28,7 +29,7 @@
 
 
         this.isGrabable = function(controllerData, props) {
-            if (dispatcherUtils.entityIsGrabbable(props) || dispatcherUtils.entityIsCloneable(props)) {
+            if (dispatcherUtils.entityIsGrabbable(props) || entityIsCloneable(props)) {
                 // if we've attempted to grab a child, roll up to the root of the tree
                 var groupRootProps = dispatcherUtils.findGroupParent(controllerData, props);
                 if (dispatcherUtils.entityIsGrabbable(groupRootProps)) {