diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 166f1a6869..0d5c095585 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -109,6 +109,23 @@
 
         { "from": "Standard.Head", "to": "Actions.Head" },
         { "from": "Standard.LeftArm", "to": "Actions.LeftArm" },
-        { "from": "Standard.RightArm", "to": "Actions.RightArm" }
+        { "from": "Standard.RightArm", "to": "Actions.RightArm" },
+        
+        { "from": "Standard.TrackedObject00", "to" : "Actions.TrackedObject00" },
+        { "from": "Standard.TrackedObject01", "to" : "Actions.TrackedObject01" },
+        { "from": "Standard.TrackedObject02", "to" : "Actions.TrackedObject02" },
+        { "from": "Standard.TrackedObject03", "to" : "Actions.TrackedObject03" },
+        { "from": "Standard.TrackedObject04", "to" : "Actions.TrackedObject04" },
+        { "from": "Standard.TrackedObject05", "to" : "Actions.TrackedObject05" },
+        { "from": "Standard.TrackedObject06", "to" : "Actions.TrackedObject06" },
+        { "from": "Standard.TrackedObject07", "to" : "Actions.TrackedObject07" },
+        { "from": "Standard.TrackedObject08", "to" : "Actions.TrackedObject08" },
+        { "from": "Standard.TrackedObject09", "to" : "Actions.TrackedObject09" },
+        { "from": "Standard.TrackedObject10", "to" : "Actions.TrackedObject10" },
+        { "from": "Standard.TrackedObject11", "to" : "Actions.TrackedObject11" },
+        { "from": "Standard.TrackedObject12", "to" : "Actions.TrackedObject12" },
+        { "from": "Standard.TrackedObject13", "to" : "Actions.TrackedObject13" },
+        { "from": "Standard.TrackedObject14", "to" : "Actions.TrackedObject14" },
+        { "from": "Standard.TrackedObject15", "to" : "Actions.TrackedObject15" }
     ]
 }
diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index 73ab5cb2ae..02fc09c815 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -77,6 +77,23 @@
         { "from": "Vive.Head", "to" : "Standard.Head"},
 
         { "from": "Vive.RightArm", "to" : "Standard.RightArm" },
-        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" }
+        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" },
+        
+        { "from": "Vive.TrackedObject00", "to" : "Standard.TrackedObject00" },
+        { "from": "Vive.TrackedObject01", "to" : "Standard.TrackedObject01" },
+        { "from": "Vive.TrackedObject02", "to" : "Standard.TrackedObject02" },
+        { "from": "Vive.TrackedObject03", "to" : "Standard.TrackedObject03" },
+        { "from": "Vive.TrackedObject04", "to" : "Standard.TrackedObject04" },
+        { "from": "Vive.TrackedObject05", "to" : "Standard.TrackedObject05" },
+        { "from": "Vive.TrackedObject06", "to" : "Standard.TrackedObject06" },
+        { "from": "Vive.TrackedObject07", "to" : "Standard.TrackedObject07" },
+        { "from": "Vive.TrackedObject08", "to" : "Standard.TrackedObject08" },
+        { "from": "Vive.TrackedObject09", "to" : "Standard.TrackedObject09" },
+        { "from": "Vive.TrackedObject10", "to" : "Standard.TrackedObject10" },
+        { "from": "Vive.TrackedObject11", "to" : "Standard.TrackedObject11" },
+        { "from": "Vive.TrackedObject12", "to" : "Standard.TrackedObject12" },
+        { "from": "Vive.TrackedObject13", "to" : "Standard.TrackedObject13" },
+        { "from": "Vive.TrackedObject14", "to" : "Standard.TrackedObject14" },
+        { "from": "Vive.TrackedObject15", "to" : "Standard.TrackedObject15" }
     ]
 }
diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp
index b3c0ed3f05..d8dd7f5e35 100644
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@@ -101,6 +101,23 @@ namespace controller {
             makePosePair(Action::RIGHT_HAND_PINKY3, "RightHandPinky3"),
             makePosePair(Action::RIGHT_HAND_PINKY4, "RightHandPinky4"),
 
+            makePosePair(Action::TRACKED_OBJECT_00, "TrackedObject00"),
+            makePosePair(Action::TRACKED_OBJECT_01, "TrackedObject01"),
+            makePosePair(Action::TRACKED_OBJECT_02, "TrackedObject02"),
+            makePosePair(Action::TRACKED_OBJECT_03, "TrackedObject03"),
+            makePosePair(Action::TRACKED_OBJECT_04, "TrackedObject04"),
+            makePosePair(Action::TRACKED_OBJECT_05, "TrackedObject05"),
+            makePosePair(Action::TRACKED_OBJECT_06, "TrackedObject06"),
+            makePosePair(Action::TRACKED_OBJECT_07, "TrackedObject07"),
+            makePosePair(Action::TRACKED_OBJECT_08, "TrackedObject08"),
+            makePosePair(Action::TRACKED_OBJECT_09, "TrackedObject09"),
+            makePosePair(Action::TRACKED_OBJECT_10, "TrackedObject10"),
+            makePosePair(Action::TRACKED_OBJECT_11, "TrackedObject11"),
+            makePosePair(Action::TRACKED_OBJECT_12, "TrackedObject12"),
+            makePosePair(Action::TRACKED_OBJECT_13, "TrackedObject13"),
+            makePosePair(Action::TRACKED_OBJECT_14, "TrackedObject14"),
+            makePosePair(Action::TRACKED_OBJECT_15, "TrackedObject15"),
+
             makeButtonPair(Action::LEFT_HAND_CLICK, "LeftHandClick"),
             makeButtonPair(Action::RIGHT_HAND_CLICK, "RightHandClick"),
 
diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h
index ec4800c9aa..6319b5746e 100644
--- a/libraries/controllers/src/controllers/Actions.h
+++ b/libraries/controllers/src/controllers/Actions.h
@@ -146,6 +146,23 @@ enum class Action {
     RIGHT_HAND_PINKY3,
     RIGHT_HAND_PINKY4,
 
+    TRACKED_OBJECT_00,
+    TRACKED_OBJECT_01,
+    TRACKED_OBJECT_02,
+    TRACKED_OBJECT_03,
+    TRACKED_OBJECT_04,
+    TRACKED_OBJECT_05,
+    TRACKED_OBJECT_06,
+    TRACKED_OBJECT_07,
+    TRACKED_OBJECT_08,
+    TRACKED_OBJECT_09,
+    TRACKED_OBJECT_10,
+    TRACKED_OBJECT_11,
+    TRACKED_OBJECT_12,
+    TRACKED_OBJECT_13,
+    TRACKED_OBJECT_14,
+    TRACKED_OBJECT_15,
+
     NUM_ACTIONS,
 };
 
diff --git a/libraries/controllers/src/controllers/StandardController.cpp b/libraries/controllers/src/controllers/StandardController.cpp
index 40b87bc6b2..ed729867df 100644
--- a/libraries/controllers/src/controllers/StandardController.cpp
+++ b/libraries/controllers/src/controllers/StandardController.cpp
@@ -166,6 +166,23 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(DD, "Down"),
         makePair(DL, "Left"),
         makePair(DR, "Right"),
+
+        makePair(TRACKED_OBJECT_00, "TrackedObject00"),
+        makePair(TRACKED_OBJECT_01, "TrackedObject01"),
+        makePair(TRACKED_OBJECT_02, "TrackedObject02"),
+        makePair(TRACKED_OBJECT_03, "TrackedObject03"),
+        makePair(TRACKED_OBJECT_04, "TrackedObject04"),
+        makePair(TRACKED_OBJECT_05, "TrackedObject05"),
+        makePair(TRACKED_OBJECT_06, "TrackedObject06"),
+        makePair(TRACKED_OBJECT_07, "TrackedObject07"),
+        makePair(TRACKED_OBJECT_08, "TrackedObject08"),
+        makePair(TRACKED_OBJECT_09, "TrackedObject09"),
+        makePair(TRACKED_OBJECT_10, "TrackedObject10"),
+        makePair(TRACKED_OBJECT_11, "TrackedObject11"),
+        makePair(TRACKED_OBJECT_12, "TrackedObject12"),
+        makePair(TRACKED_OBJECT_13, "TrackedObject13"),
+        makePair(TRACKED_OBJECT_14, "TrackedObject14"),
+        makePair(TRACKED_OBJECT_15, "TrackedObject15")
     };
     return availableInputs;
 }
diff --git a/scripts/developer/tests/puck-attach.js b/scripts/developer/tests/puck-attach.js
index 2d0a2e6d02..dd94f81a99 100644
--- a/scripts/developer/tests/puck-attach.js
+++ b/scripts/developer/tests/puck-attach.js
@@ -84,7 +84,7 @@ function getAvailableTrackedObjects() {
     var i;
     for (i = 0; i < NUM_TRACKED_OBJECTS; i++) {
         var key = indexToTrackedObjectName(i);
-        var pose = Controller.getPoseValue(Controller.Hardware.Vive[key]);
+        var pose = Controller.getPoseValue(Controller.Standard[key]);
         if (pose && pose.valid) {
             available.push(i);
         }
@@ -126,8 +126,8 @@ function pad(num, size) {
 }
 
 function update() {
-    if (attachedEntity && attachedObj && Controller.Hardware.Vive) {
-        var pose = Controller.getPoseValue(Controller.Hardware.Vive[attachedObj.key]);
+    if (attachedEntity && attachedObj && Controller.Standard) {
+        var pose = Controller.getPoseValue(Controller.Standard[attachedObj.key]);
         var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position);
         var puckXform = new Xform(pose.rotation, pose.translation);
         var finalXform = Xform.mul(avatarXform, Xform.mul(puckXform, attachedObj.localXform));
diff --git a/scripts/developer/tests/viveTrackedObjects.js b/scripts/developer/tests/viveTrackedObjects.js
index 4155afb82b..1d60f658d9 100644
--- a/scripts/developer/tests/viveTrackedObjects.js
+++ b/scripts/developer/tests/viveTrackedObjects.js
@@ -23,7 +23,7 @@ var BLUE = {x: 0, y: 0, z: 1, w: 1};
 function update(dt) {
     if (Controller.Hardware.Vive) {
         TRACKED_OBJECT_POSES.forEach(function (key) {
-            var pose = Controller.getPoseValue(Controller.Hardware.Vive[key]);
+            var pose = Controller.getPoseValue(Controller.Standard[key]);
             if (pose.valid) {
                 DebugDraw.addMyAvatarMarker(key, pose.rotation, pose.translation, BLUE);
             } else {