diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 54afabfd21..0ef2db3b9d 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -7,11 +7,13 @@ if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(
   audio avatars octree gpu model fbx entities
   networking animation recording shared script-engine embedded-webserver
-  controllers physics plugins
+  physics plugins
 )
 
 if (WIN32)
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 5e0cd740e6..93b9b10eb7 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -166,19 +166,6 @@ void AudioMixer::handleMuteEnvironmentPacket(QSharedPointer<ReceivedMessage> mes
     }
 }
 
-DisplayPluginList getDisplayPlugins() {
-    DisplayPluginList result;
-    return result;
-}
-
-InputPluginList getInputPlugins() {
-    InputPluginList result;
-    return result;
-}
-
-// must be here to satisfy a reference in PluginManager::saveSettings()
-void saveInputPluginSettings(const InputPluginList& plugins) {}
-
 const std::pair<QString, CodecPluginPointer> AudioMixer::negotiateCodec(std::vector<QString> codecs) {
     QString selectedCodecName;
     CodecPluginPointer selectedCodec;
diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index 2d800c3561..ed63bbc298 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -497,13 +497,14 @@ float computeGain(const AvatarAudioStream& listeningNodeStream, const Positional
     // avatar: apply fixed off-axis attenuation to make them quieter as they turn away
     } else if (!isEcho && (streamToAdd.getType() == PositionalAudioStream::Microphone)) {
         glm::vec3 rotatedListenerPosition = glm::inverse(streamToAdd.getOrientation()) * relativePosition;
-        float angleOfDelivery = glm::angle(glm::vec3(0.0f, 0.0f, -1.0f),
-                                           glm::normalize(rotatedListenerPosition));
+
+        // source directivity is based on angle of emission, in local coordinates
+        glm::vec3 direction = glm::normalize(rotatedListenerPosition);
+        float angleOfDelivery = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f));   // UNIT_NEG_Z is "forward"
 
         const float MAX_OFF_AXIS_ATTENUATION = 0.2f;
         const float OFF_AXIS_ATTENUATION_STEP = (1 - MAX_OFF_AXIS_ATTENUATION) / 2.0f;
-        float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION +
-            (angleOfDelivery * (OFF_AXIS_ATTENUATION_STEP / PI_OVER_TWO));
+        float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION + (angleOfDelivery * (OFF_AXIS_ATTENUATION_STEP / PI_OVER_TWO));
 
         gain *= offAxisCoefficient;
     }
@@ -545,7 +546,6 @@ float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const Positio
         const glm::vec3& relativePosition) {
     glm::quat inverseOrientation = glm::inverse(listeningNodeStream.getOrientation());
 
-    //  Compute sample delay for the two ears to create phase panning
     glm::vec3 rotatedSourcePosition = inverseOrientation * relativePosition;
 
     // project the rotated source position vector onto the XZ plane
@@ -553,11 +553,16 @@ float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const Positio
 
     const float SOURCE_DISTANCE_THRESHOLD = 1e-30f;
 
-    if (glm::length2(rotatedSourcePosition) > SOURCE_DISTANCE_THRESHOLD) {
+    float rotatedSourcePositionLength2 = glm::length2(rotatedSourcePosition);
+    if (rotatedSourcePositionLength2 > SOURCE_DISTANCE_THRESHOLD) {
+        
         // produce an oriented angle about the y-axis
-        return glm::orientedAngle(glm::vec3(0.0f, 0.0f, -1.0f), glm::normalize(rotatedSourcePosition), glm::vec3(0.0f, -1.0f, 0.0f));
-    } else {
-        // there is no distance between listener and source - return no azimuth
-        return 0;
+        glm::vec3 direction = rotatedSourcePosition * (1.0f / fastSqrtf(rotatedSourcePositionLength2));
+		float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
+        return (direction.x < 0.0f) ? -angle : angle;
+
+    } else {   
+        // no azimuth if they are in same spot
+        return 0.0f; 
     }
 }
diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 3a5116a2e9..f218daed03 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -229,7 +229,7 @@ void AvatarMixer::start() {
             auto start = usecTimestampNow();
             nodeList->nestedEach([&](NodeList::const_iterator cbegin, NodeList::const_iterator cend) {
                 std::for_each(cbegin, cend, [&](const SharedNodePointer& node) {
-                    if (node->getType() == NodeType::Agent && !node->isUpstream()) {
+                    if (node->getType() == NodeType::Agent) {
                         manageIdentityData(node);
                     }
 
@@ -325,8 +325,8 @@ void AvatarMixer::manageIdentityData(const SharedNodePointer& node) {
             sendIdentity = true;
         }
     }
-    if (sendIdentity) {
-
+    if (sendIdentity && !node->isUpstream()) {
+        sendIdentityPacket(nodeData, node); // Tell node whose name changed about its new session display name or avatar.
         // since this packet includes a change to either the skeleton model URL or the display name
         // it needs a new sequence number
         nodeData->getAvatar().pushIdentitySequenceNumber();
diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index bbf68f0e22..4ff447a95a 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp
@@ -81,7 +81,7 @@ int AvatarMixerSlave::sendIdentityPacket(const AvatarMixerClientData* nodeData,
 
 int AvatarMixerSlave::sendReplicatedIdentityPacket(const Node& agentNode, const AvatarMixerClientData* nodeData, const Node& destinationNode) {
     if (AvatarMixer::shouldReplicateTo(agentNode, destinationNode)) {
-        QByteArray individualData = nodeData->getConstAvatarData()->identityByteArray();
+        QByteArray individualData = nodeData->getConstAvatarData()->identityByteArray(true);
         individualData.replace(0, NUM_BYTES_RFC4122_UUID, nodeData->getNodeID().toRfc4122()); // FIXME, this looks suspicious
         auto identityPacket = NLPacketList::create(PacketType::ReplicatedAvatarIdentity, QByteArray(), true, true);
         identityPacket->write(individualData);
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 2ce537a5a0..c1e275e4d3 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -14,6 +14,8 @@ if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
 
+setup_memory_debugger()
+
 # TODO: find a solution that will handle web file changes in resources on windows without a re-build.
 # Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will
 # not be re-copied. This is worked-around on OS X/UNIX by using a symlink.
diff --git a/domain-server/src/DomainMetadata.cpp b/domain-server/src/DomainMetadata.cpp
index c19cefa397..eee5673af3 100644
--- a/domain-server/src/DomainMetadata.cpp
+++ b/domain-server/src/DomainMetadata.cpp
@@ -171,7 +171,7 @@ void DomainMetadata::maybeUpdateUsers() {
         if (linkedData) {
             auto nodeData = static_cast<DomainServerNodeData*>(linkedData);
 
-            if (!nodeData->wasAssigned()) {
+            if (!nodeData->wasAssigned() && node->getType() == NodeType::Agent) {
                 ++numConnected;
 
                 if (nodeData->getUsername().isEmpty()) {
diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt
index e5bdffe2e2..07b90b369e 100644
--- a/ice-server/CMakeLists.txt
+++ b/ice-server/CMakeLists.txt
@@ -18,5 +18,7 @@ endif ()
 
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 
+setup_memory_debugger()
+
 # append OpenSSL to our list of libraries to link
 target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 71341f3f11..dcb1cacef9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -4,6 +4,8 @@ project(${TARGET_NAME})
 # set a default root dir for each of our optional externals if it was not passed
 set(OPTIONAL_EXTERNALS "LeapMotion")
 
+setup_memory_debugger()
+
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   string(TOUPPER ${EXTERNAL} ${EXTERNAL}_UPPERCASE)
   if (NOT ${${EXTERNAL}_UPPERCASE}_ROOT_DIR)
diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json
index 1412b45968..a493d8e9af 100644
--- a/interface/resources/avatar/avatar-animation.json
+++ b/interface/resources/avatar/avatar-animation.json
@@ -68,7 +68,10 @@
                                     "typeVar": "rightHandType",
                                     "weightVar": "rightHandWeight",
                                     "weight": 1.0,
-                                    "flexCoefficients": [1, 0.5, 0.5, 0.2, 0.01, 0.005, 0.001, 0.0, 0.0]
+                                    "flexCoefficients": [1, 0.5, 0.5, 0.2, 0.01, 0.005, 0.001, 0.0, 0.0],
+                                    "poleVectorEnabledVar": "rightHandPoleVectorEnabled",
+                                    "poleReferenceVectorVar": "rightHandPoleReferenceVector",
+                                    "poleVectorVar": "rightHandPoleVector"
                                 },
                                 {
                                     "jointName": "LeftHand",
@@ -77,7 +80,10 @@
                                     "typeVar": "leftHandType",
                                     "weightVar": "leftHandWeight",
                                     "weight": 1.0,
-                                    "flexCoefficients": [1, 0.5, 0.5, 0.2, 0.01, 0.005, 0.001, 0.0, 0.0]
+                                    "flexCoefficients": [1, 0.5, 0.5, 0.2, 0.01, 0.005, 0.001, 0.0, 0.0],
+                                    "poleVectorEnabledVar": "leftHandPoleVectorEnabled",
+                                    "poleReferenceVectorVar": "leftHandPoleReferenceVector",
+                                    "poleVectorVar": "leftHandPoleVector"
                                 },
                                 {
                                     "jointName": "RightFoot",
@@ -86,7 +92,10 @@
                                     "typeVar": "rightFootType",
                                     "weightVar": "rightFootWeight",
                                     "weight": 1.0,
-                                    "flexCoefficients": [1, 0.45, 0.45]
+                                    "flexCoefficients": [1, 0.45, 0.45],
+                                    "poleVectorEnabledVar": "rightFootPoleVectorEnabled",
+                                    "poleReferenceVectorVar": "rightFootPoleReferenceVector",
+                                    "poleVectorVar": "rightFootPoleVector"
                                 },
                                 {
                                     "jointName": "LeftFoot",
@@ -95,7 +104,10 @@
                                     "typeVar": "leftFootType",
                                     "weightVar": "leftFootWeight",
                                     "weight": 1.0,
-                                    "flexCoefficients": [1, 0.45, 0.45]
+                                    "flexCoefficients": [1, 0.45, 0.45],
+                                    "poleVectorEnabledVar": "leftFootPoleVectorEnabled",
+                                    "poleReferenceVectorVar": "leftFootPoleReferenceVector",
+                                    "poleVectorVar": "leftFootPoleVector"
                                 },
                                 {
                                     "jointName": "Spine2",
@@ -138,28 +150,19 @@
                         "children": []
                     },
                     {
-                        "id": "hipsManipulatorOverlay",
+                        "id": "defaultPoseOverlay",
                         "type": "overlay",
                         "data": {
                             "alpha": 0.0,
-                            "boneSet": "hipsOnly"
+                            "alphaVar": "defaultPoseOverlayAlpha",
+                            "boneSet": "fullBody",
+                            "boneSetVar": "defaultPoseOverlayBoneSet"
                         },
                         "children": [
                             {
-                                "id": "hipsManipulator",
-                                "type": "manipulator",
+                                "id": "defaultPose",
+                                "type": "defaultPose",
                                 "data": {
-                                    "alpha": 0.0,
-                                    "alphaVar": "hipsManipulatorAlpha",
-                                    "joints": [
-                                        {
-                                            "jointName": "Hips",
-                                            "rotationType": "absolute",
-                                            "translationType": "absolute",
-                                            "rotationVar": "hipsManipulatorRotation",
-                                            "translationVar": "hipsManipulatorPosition"
-                                        }
-                                    ]
                                 },
                                 "children": []
                             },
diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml
index 3ce297ef80..d672fa6387 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@@ -217,7 +217,7 @@ FocusScope {
                         anchors.leftMargin: hifi.dimensions.textPadding
                         anchors.verticalCenter: parent.verticalCenter
                         id: popupText
-                        text: listView.model[index] ? listView.model[index] : (listView.model.get(index).text ? listView.model.get(index).text : "")
+                        text: listView.model[index] ? listView.model[index] : (listView.model.get && listView.model.get(index).text ? listView.model.get(index).text : "")
                         size: hifi.fontSizes.textFieldInput
                         color: hifi.colors.baseGray
                     }
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 0886a25949..106e067968 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -34,6 +34,8 @@ ModalWindow {
 
     HifiConstants { id: hifi }
 
+    property var filesModel: ListModel { }
+
     Settings {
         category: "FileDialog"
         property alias width: root.width
@@ -253,7 +255,9 @@ ModalWindow {
                 }
 
                 currentSelectionUrl = helper.pathToUrl(fileTableView.model.get(row).filePath);
-                currentSelectionIsFolder = fileTableView.model.isFolder(row);
+                currentSelectionIsFolder = fileTableView.model !== filesModel ?
+                            fileTableView.model.isFolder(row) :
+                            fileTableModel.isFolder(row);
                 if (root.selectDirectory || !currentSelectionIsFolder) {
                     currentSelection.text = capitalizeDrive(helper.urlToPath(currentSelectionUrl));
                 } else {
@@ -331,7 +335,12 @@ ModalWindow {
             }
         }
 
-        ListModel {
+        Component {
+            id: filesModelBuilder
+            ListModel { }
+        }
+
+        QtObject {
             id: fileTableModel
 
             // FolderListModel has a couple of problems:
@@ -383,7 +392,11 @@ ModalWindow {
                 if (row === -1) {
                     return false;
                 }
-                return get(row).fileIsDir;
+                return filesModel.get(row).fileIsDir;
+            }
+
+            function get(row) {
+                return filesModel.get(row)
             }
 
             function update() {
@@ -401,7 +414,7 @@ ModalWindow {
                     rows = 0,
                     i;
 
-                clear();
+                var newFilesModel = filesModelBuilder.createObject(root);
 
                 comparisonFunction = sortOrder === Qt.AscendingOrder
                     ? function(a, b) { return a < b; }
@@ -423,7 +436,7 @@ ModalWindow {
                     while (lower < upper) {
                         middle = Math.floor((lower + upper) / 2);
                         var lessThan;
-                        if (comparisonFunction(sortValue, get(middle)[sortField])) {
+                        if (comparisonFunction(sortValue, newFilesModel.get(middle)[sortField])) {
                             lessThan = true;
                             upper = middle;
                         } else {
@@ -432,7 +445,7 @@ ModalWindow {
                         }
                     }
 
-                    insert(lower, {
+                    newFilesModel.insert(lower, {
                        fileName: fileName,
                        fileModified: (fileIsDir ? new Date(0) : model.getItem(i, "fileModified")),
                        fileSize: model.getItem(i, "fileSize"),
@@ -443,6 +456,7 @@ ModalWindow {
 
                     rows++;
                 }
+                filesModel = newFilesModel;
 
                 d.clearSelection();
             }
@@ -469,7 +483,7 @@ ModalWindow {
             sortIndicatorOrder: Qt.AscendingOrder
             sortIndicatorVisible: true
 
-            model: fileTableModel
+            model: filesModel
 
             function updateSort() {
                 model.sortOrder = sortIndicatorOrder;
@@ -561,11 +575,12 @@ ModalWindow {
             }
 
             function navigateToCurrentRow() {
+                var currentModel = fileTableView.model !== filesModel ? fileTableView.model : fileTableModel
                 var row = fileTableView.currentRow
-                var isFolder = model.isFolder(row);
-                var file = model.get(row).filePath;
+                var isFolder = currentModel.isFolder(row);
+                var file = currentModel.get(row).filePath;
                 if (isFolder) {
-                    fileTableView.model.folder = helper.pathToUrl(file);
+                    currentModel.folder = helper.pathToUrl(file);
                 } else {
                     okAction.trigger();
                 }
@@ -580,7 +595,8 @@ ModalWindow {
                 var newPrefix = prefix + event.text.toLowerCase();
                 var matchedIndex = -1;
                 for (var i = 0; i < model.count; ++i) {
-                    var name = model.get(i).fileName.toLowerCase();
+                    var name = model !== filesModel ? model.get(i).fileName.toLowerCase() :
+                                                      filesModel.get(i).fileName.toLowerCase();
                     if (0 === name.indexOf(newPrefix)) {
                         matchedIndex = i;
                         break;
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index 5e33663436..9e1d0a9f5a 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -25,11 +25,14 @@ import "fileDialog"
 //FIXME implement shortcuts for favorite location
 TabletModalWindow {
     id: root
+
     anchors.fill: parent
     width: parent.width
     height: parent.height
     HifiConstants { id: hifi }
 
+    property var filesModel: ListModel { }
+
     Settings {
         category: "FileDialog"
         property alias width: root.width
@@ -250,7 +253,9 @@ TabletModalWindow {
                 }
 
                 currentSelectionUrl = helper.pathToUrl(fileTableView.model.get(row).filePath);
-                currentSelectionIsFolder = fileTableView.model.isFolder(row);
+                currentSelectionIsFolder = fileTableView.model !== filesModel ?
+                            fileTableView.model.isFolder(row) :
+                            fileTableModel.isFolder(row);
                 if (root.selectDirectory || !currentSelectionIsFolder) {
                     currentSelection.text = capitalizeDrive(helper.urlToPath(currentSelectionUrl));
                 } else {
@@ -288,7 +293,7 @@ TabletModalWindow {
             }
 
             onFolderChanged: {
-                fileTableModel.update();  // Update once the data from the folder change is available.
+                fileTableModel.update()
             }
 
             function getItem(index, field) {
@@ -328,7 +333,12 @@ TabletModalWindow {
             }
         }
 
-        ListModel {
+        Component {
+            id: filesModelBuilder
+            ListModel { }
+        }
+
+        QtObject {
             id: fileTableModel
 
             // FolderListModel has a couple of problems:
@@ -359,17 +369,16 @@ TabletModalWindow {
             }
 
             onFolderChanged: {
+
                 if (folder === rootFolder) {
                     model = driveListModel;
                     helper.monitorDirectory("");
                     update();
                 } else {
                     var needsUpdate = model === driveListModel && folder === folderListModel.folder;
-
                     model = folderListModel;
                     folderListModel.folder = folder;
                     helper.monitorDirectory(helper.urlToPath(folder));
-
                     if (needsUpdate) {
                         update();
                     }
@@ -380,7 +389,11 @@ TabletModalWindow {
                 if (row === -1) {
                     return false;
                 }
-                return get(row).fileIsDir;
+                return filesModel.get(row).fileIsDir;
+            }
+
+            function get(row) {
+                return filesModel.get(row)
             }
 
             function update() {
@@ -398,7 +411,7 @@ TabletModalWindow {
                     rows = 0,
                     i;
 
-                clear();
+                var newFilesModel = filesModelBuilder.createObject(root);
 
                 comparisonFunction = sortOrder === Qt.AscendingOrder
                     ? function(a, b) { return a < b; }
@@ -420,7 +433,7 @@ TabletModalWindow {
                     while (lower < upper) {
                         middle = Math.floor((lower + upper) / 2);
                         var lessThan;
-                        if (comparisonFunction(sortValue, get(middle)[sortField])) {
+                        if (comparisonFunction(sortValue, newFilesModel.get(middle)[sortField])) {
                             lessThan = true;
                             upper = middle;
                         } else {
@@ -429,7 +442,7 @@ TabletModalWindow {
                         }
                     }
 
-                    insert(lower, {
+                    newFilesModel.insert(lower, {
                        fileName: fileName,
                        fileModified: (fileIsDir ? new Date(0) : model.getItem(i, "fileModified")),
                        fileSize: model.getItem(i, "fileSize"),
@@ -440,6 +453,7 @@ TabletModalWindow {
 
                     rows++;
                 }
+                filesModel = newFilesModel;
 
                 d.clearSelection();
             }
@@ -467,7 +481,7 @@ TabletModalWindow {
             sortIndicatorOrder: Qt.AscendingOrder
             sortIndicatorVisible: true
 
-            model: fileTableModel
+            model: filesModel
 
             function updateSort() {
                 model.sortOrder = sortIndicatorOrder;
@@ -559,11 +573,12 @@ TabletModalWindow {
             }
 
             function navigateToCurrentRow() {
+                var currentModel = fileTableView.model !== filesModel ? fileTableView.model : fileTableModel
                 var row = fileTableView.currentRow
-                var isFolder = model.isFolder(row);
-                var file = model.get(row).filePath;
+                var isFolder = currentModel.isFolder(row);
+                var file = currentModel.get(row).filePath;
                 if (isFolder) {
-                    fileTableView.model.folder = helper.pathToUrl(file);
+                    currentModel.folder = helper.pathToUrl(file);
                 } else {
                     okAction.trigger();
                 }
@@ -578,7 +593,8 @@ TabletModalWindow {
                 var newPrefix = prefix + event.text.toLowerCase();
                 var matchedIndex = -1;
                 for (var i = 0; i < model.count; ++i) {
-                    var name = model.get(i).fileName.toLowerCase();
+                    var name = model !== filesModel ? model.get(i).fileName.toLowerCase() :
+                                                      filesModel.get(i).fileName.toLowerCase();
                     if (0 === name.indexOf(newPrefix)) {
                         matchedIndex = i;
                         break;
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 91c1d99cf5..65517f5a73 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -43,6 +43,7 @@ Item {
     property bool selected: false
     property bool isAdmin: false
     property bool isPresent: true
+    property bool isReplicated: false
     property string placeName: ""
     property string profilePicBorderColor: (connectionStatus == "connection" ? hifi.colors.indigoAccent : (connectionStatus == "friend" ? hifi.colors.greenHighlight : "transparent"))
     property alias avImage: avatarImage
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index bbb42e61ac..8db04a0f5b 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -473,6 +473,7 @@ Rectangle {
                     visible: !isCheckBox && !isButton && !isAvgAudio;
                     uuid: model ? model.sessionId : "";
                     selected: styleData.selected;
+                    isReplicated: model.isReplicated;
                     isAdmin: model && model.admin;
                     isPresent: model && model.isPresent;
                     // Size
@@ -553,6 +554,7 @@ Rectangle {
                     id: actionButton;
                     color: 2; // Red
                     visible: isButton;
+                    enabled: !nameCard.isReplicated;
                     anchors.centerIn: parent;
                     width: 32;
                     height: 32;
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
index 26e35c4dcf..7b91cfeba9 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
@@ -23,11 +23,13 @@ import "../../../windows"
 import "../../../dialogs/fileDialog"
 
 //FIXME implement shortcuts for favorite location
-Item {
+Rectangle {
     id: root
-    anchors.top: parent.top
+    anchors.top: parent ? parent.top : undefined
     HifiConstants { id: hifi }
 
+    color: hifi.colors.baseGray;
+
     Settings {
         category: "FileDialog"
         property alias width: root.width
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index cfb8db42d7..75bcee0703 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -37,8 +37,6 @@
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickWindow>
 
-#include <QtWebEngineWidgets/QWebEngineProfile>
-
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QMessageBox>
 
@@ -441,6 +439,11 @@ static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement";
 static const QString STATE_GROUNDED = "Grounded";
 static const QString STATE_NAV_FOCUSED = "NavigationFocused";
 
+// Statically provided display and input plugins
+extern DisplayPluginList getDisplayPlugins();
+extern InputPluginList getInputPlugins();
+extern void saveInputPluginSettings(const InputPluginList& plugins);
+
 bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     const char** constArgv = const_cast<const char**>(argv);
 
@@ -480,7 +483,12 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
 
     Setting::init();
 
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+    // Tell the plugin manager about our statically linked plugins
+    auto pluginManager = PluginManager::getInstance();
+    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
+    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
+    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
+    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
         steamClient->init();
     }
 
@@ -714,9 +722,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     updateHeartbeat();
 
     // setup a timer for domain-server check ins
-    QTimer* domainCheckInTimer = new QTimer(nodeList.data());
+    QTimer* domainCheckInTimer = new QTimer(this);
     connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
     domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
+    connect(this, &QCoreApplication::aboutToQuit, [domainCheckInTimer] {
+        domainCheckInTimer->stop();
+        domainCheckInTimer->deleteLater();
+    });
 
 
     auto audioIO = DependencyManager::get<AudioClient>();
@@ -903,11 +915,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         _saveAvatarOverrideUrl = true;
     }
 
-    QString defaultScriptsLocation = getCmdOption(argc, constArgv, "--scripts");
-    if (!defaultScriptsLocation.isEmpty()) {
-        PathUtils::defaultScriptsLocation(defaultScriptsLocation);
-    }
-
     _glWidget = new GLCanvas();
     getApplicationCompositor().setRenderingWidget(_glWidget);
     _window->setCentralWidget(_glWidget);
@@ -1174,7 +1181,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // do this as late as possible so that all required subsystems are initialized
     // If we've overridden the default scripts location, just load default scripts
     // otherwise, load 'em all
-    if (!defaultScriptsLocation.isEmpty()) {
+
+    // we just want to see if --scripts was set, we've already parsed it and done
+    // the change in PathUtils.  Rather than pass that in the constructor, lets just
+    // look (this could be debated)
+    QString scriptsSwitch = QString("--").append(SCRIPTS_SWITCH);
+    QDir defaultScriptsLocation(getCmdOption(argc, constArgv, scriptsSwitch.toStdString().c_str()));
+    if (!defaultScriptsLocation.exists()) {
         scriptEngines->loadDefaultScripts();
         scriptEngines->defaultScriptsLocationOverridden(true);
     } else {
@@ -4082,7 +4095,10 @@ void Application::init() {
         EntityTreePointer tree = getEntities()->getTree();
         if (auto entity = tree->findEntityByEntityItemID(id)) {
             auto sound = DependencyManager::get<SoundCache>()->getSound(newURL);
-            entity->setCollisionSound(sound);
+            auto renderable = entity->getRenderableInterface();
+            if (renderable) {
+                renderable->setCollisionSound(sound);
+            }
         }
     }, Qt::QueuedConnection);
     connect(getMyAvatar().get(), &MyAvatar::newCollisionSoundURL, this, [this](QUrl newURL) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index cab42d1e1c..c26b3b215e 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -95,6 +95,7 @@ static const UINT UWM_SHOW_APPLICATION =
 #endif
 
 static const QString RUNNING_MARKER_FILENAME = "Interface.running";
+static const QString SCRIPTS_SWITCH = "scripts";
 
 class Application;
 #if defined(qApp)
@@ -297,6 +298,7 @@ public:
     void setAvatarOverrideUrl(const QUrl& url, bool save);
     QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; }
     bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }
+    void setCacheOverrideDir(const QString& dirName) { _cacheDir = dirName; }
 
 signals:
     void svoImportRequested(const QString& url);
@@ -688,5 +690,7 @@ private:
 
     QUrl _avatarOverrideUrl;
     bool _saveAvatarOverrideUrl { false };
+
+    QString _cacheDir;
 };
 #endif // hifi_Application_h
diff --git a/interface/src/SecondaryCamera.cpp b/interface/src/SecondaryCamera.cpp
index f6ee8caa61..f59d2fcc7a 100644
--- a/interface/src/SecondaryCamera.cpp
+++ b/interface/src/SecondaryCamera.cpp
@@ -79,6 +79,7 @@ public:
 
             gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
                 batch.disableContextStereo();
+                batch.disableContextViewCorrection();
             });
 
             auto srcViewFrustum = args->getViewFrustum();
@@ -112,6 +113,7 @@ public:
 
         gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
             batch.restoreContextStereo();
+            batch.restoreContextViewCorrection();
         });
     }
 };
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index e74df4cf0f..89b6c36c63 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -47,110 +47,113 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
 
     MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
 
-    Rig::HeadParameters headParams;
+    Rig::ControllerParameters params;
+
+    AnimPose avatarToRigPose(glm::vec3(1.0f), Quaternions::Y_180, glm::vec3(0.0f));
 
     // input action is the highest priority source for head orientation.
     auto avatarHeadPose = myAvatar->getHeadControllerPoseInAvatarFrame();
     if (avatarHeadPose.isValid()) {
-        glm::mat4 rigHeadMat = Matrices::Y_180 *
-            createMatFromQuatAndPos(avatarHeadPose.getRotation(), avatarHeadPose.getTranslation());
-        headParams.rigHeadPosition = extractTranslation(rigHeadMat);
-        headParams.rigHeadOrientation = glmExtractRotation(rigHeadMat);
-        headParams.headEnabled = true;
+        AnimPose pose(avatarHeadPose.getRotation(), avatarHeadPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_Head] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_Head] = true;
     } else {
         // even though full head IK is disabled, the rig still needs the head orientation to rotate the head up and
         // down in desktop mode.
         // preMult 180 is necessary to convert from avatar to rig coordinates.
         // postMult 180 is necessary to convert head from -z forward to z forward.
-        headParams.rigHeadOrientation = Quaternions::Y_180 * head->getFinalOrientationInLocalFrame() * Quaternions::Y_180;
-        headParams.headEnabled = false;
+        glm::quat headRot = Quaternions::Y_180 * head->getFinalOrientationInLocalFrame() * Quaternions::Y_180;
+        params.controllerPoses[Rig::ControllerType_Head] = AnimPose(glm::vec3(1.0f), headRot, glm::vec3(0.0f));
+        params.controllerActiveFlags[Rig::ControllerType_Head] = false;
     }
 
     auto avatarHipsPose = myAvatar->getHipsControllerPoseInAvatarFrame();
     if (avatarHipsPose.isValid()) {
-        glm::mat4 rigHipsMat = Matrices::Y_180 * createMatFromQuatAndPos(avatarHipsPose.getRotation(), avatarHipsPose.getTranslation());
-        headParams.hipsMatrix = rigHipsMat;
-        headParams.hipsEnabled = true;
+        AnimPose pose(avatarHipsPose.getRotation(), avatarHipsPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_Hips] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_Hips] = true;
     } else {
-        headParams.hipsEnabled = false;
+        params.controllerPoses[Rig::ControllerType_Hips] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_Hips] = false;
     }
 
     auto avatarSpine2Pose = myAvatar->getSpine2ControllerPoseInAvatarFrame();
     if (avatarSpine2Pose.isValid()) {
-        glm::mat4 rigSpine2Mat = Matrices::Y_180 * createMatFromQuatAndPos(avatarSpine2Pose.getRotation(), avatarSpine2Pose.getTranslation());
-        headParams.spine2Matrix = rigSpine2Mat;
-        headParams.spine2Enabled = true;
+        AnimPose pose(avatarSpine2Pose.getRotation(), avatarSpine2Pose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_Spine2] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_Spine2] = true;
     } else {
-        headParams.spine2Enabled = false;
+        params.controllerPoses[Rig::ControllerType_Spine2] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_Spine2] = false;
     }
 
     auto avatarRightArmPose = myAvatar->getRightArmControllerPoseInAvatarFrame();
     if (avatarRightArmPose.isValid()) {
-        glm::mat4 rightArmMat = Matrices::Y_180 * createMatFromQuatAndPos(avatarRightArmPose.getRotation(), avatarRightArmPose.getTranslation());
-        headParams.rightArmPosition = extractTranslation(rightArmMat);
-        headParams.rightArmRotation = glmExtractRotation(rightArmMat);
-        headParams.rightArmEnabled = true;
+        AnimPose pose(avatarRightArmPose.getRotation(), avatarRightArmPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_RightArm] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_RightArm] = true;
     } else {
-        headParams.rightArmEnabled = false;
+        params.controllerPoses[Rig::ControllerType_RightArm] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_RightArm] = false;
     }
-    
+
     auto avatarLeftArmPose = myAvatar->getLeftArmControllerPoseInAvatarFrame();
     if (avatarLeftArmPose.isValid()) {
-        glm::mat4 leftArmMat = Matrices::Y_180 * createMatFromQuatAndPos(avatarLeftArmPose.getRotation(), avatarLeftArmPose.getTranslation());
-        headParams.leftArmPosition = extractTranslation(leftArmMat);
-        headParams.leftArmRotation = glmExtractRotation(leftArmMat);
-        headParams.leftArmEnabled = true;
+        AnimPose pose(avatarLeftArmPose.getRotation(), avatarLeftArmPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_LeftArm] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_LeftArm] = true;
     } else {
-        headParams.leftArmEnabled = false;
+        params.controllerPoses[Rig::ControllerType_LeftArm] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_LeftArm] = false;
     }
 
-    headParams.isTalking = head->getTimeWithoutTalking() <= 1.5f;
-
-    _rig.updateFromHeadParameters(headParams, deltaTime);
-
-    Rig::HandAndFeetParameters handAndFeetParams;
-
-    auto leftPose = myAvatar->getLeftHandControllerPoseInAvatarFrame();
-    if (leftPose.isValid()) {
-        handAndFeetParams.isLeftEnabled = true;
-        handAndFeetParams.leftPosition = Quaternions::Y_180 * leftPose.getTranslation();
-        handAndFeetParams.leftOrientation = Quaternions::Y_180 * leftPose.getRotation();
+    auto avatarLeftHandPose = myAvatar->getLeftHandControllerPoseInAvatarFrame();
+    if (avatarLeftHandPose.isValid()) {
+        AnimPose pose(avatarLeftHandPose.getRotation(), avatarLeftHandPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_LeftHand] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_LeftHand] = true;
     } else {
-        handAndFeetParams.isLeftEnabled = false;
+        params.controllerPoses[Rig::ControllerType_LeftHand] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_LeftHand] = false;
     }
 
-    auto rightPose = myAvatar->getRightHandControllerPoseInAvatarFrame();
-    if (rightPose.isValid()) {
-        handAndFeetParams.isRightEnabled = true;
-        handAndFeetParams.rightPosition = Quaternions::Y_180 * rightPose.getTranslation();
-        handAndFeetParams.rightOrientation = Quaternions::Y_180 * rightPose.getRotation();
+    auto avatarRightHandPose = myAvatar->getRightHandControllerPoseInAvatarFrame();
+    if (avatarRightHandPose.isValid()) {
+        AnimPose pose(avatarRightHandPose.getRotation(), avatarRightHandPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_RightHand] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_RightHand] = true;
     } else {
-        handAndFeetParams.isRightEnabled = false;
+        params.controllerPoses[Rig::ControllerType_RightHand] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_RightHand] = false;
     }
 
-    auto leftFootPose = myAvatar->getLeftFootControllerPoseInAvatarFrame();
-    if (leftFootPose.isValid()) {
-        handAndFeetParams.isLeftFootEnabled = true;
-        handAndFeetParams.leftFootPosition = Quaternions::Y_180 * leftFootPose.getTranslation();
-        handAndFeetParams.leftFootOrientation = Quaternions::Y_180 * leftFootPose.getRotation();
+    auto avatarLeftFootPose = myAvatar->getLeftFootControllerPoseInAvatarFrame();
+    if (avatarLeftFootPose.isValid()) {
+        AnimPose pose(avatarLeftFootPose.getRotation(), avatarLeftFootPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_LeftFoot] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_LeftFoot] = true;
     } else {
-        handAndFeetParams.isLeftFootEnabled = false;
+        params.controllerPoses[Rig::ControllerType_LeftFoot] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_LeftFoot] = false;
     }
 
-    auto rightFootPose = myAvatar->getRightFootControllerPoseInAvatarFrame();
-    if (rightFootPose.isValid()) {
-        handAndFeetParams.isRightFootEnabled = true;
-        handAndFeetParams.rightFootPosition = Quaternions::Y_180 * rightFootPose.getTranslation();
-        handAndFeetParams.rightFootOrientation = Quaternions::Y_180 * rightFootPose.getRotation();
+    auto avatarRightFootPose = myAvatar->getRightFootControllerPoseInAvatarFrame();
+    if (avatarRightFootPose.isValid()) {
+        AnimPose pose(avatarRightFootPose.getRotation(), avatarRightFootPose.getTranslation());
+        params.controllerPoses[Rig::ControllerType_RightFoot] = avatarToRigPose * pose;
+        params.controllerActiveFlags[Rig::ControllerType_RightFoot] = true;
     } else {
-        handAndFeetParams.isRightFootEnabled = false;
+        params.controllerPoses[Rig::ControllerType_RightFoot] = AnimPose::identity;
+        params.controllerActiveFlags[Rig::ControllerType_RightFoot] = false;
     }
 
-    handAndFeetParams.bodyCapsuleRadius = myAvatar->getCharacterController()->getCapsuleRadius();
-    handAndFeetParams.bodyCapsuleHalfHeight = myAvatar->getCharacterController()->getCapsuleHalfHeight();
-    handAndFeetParams.bodyCapsuleLocalOffset = myAvatar->getCharacterController()->getCapsuleLocalOffset();
+    params.bodyCapsuleRadius = myAvatar->getCharacterController()->getCapsuleRadius();
+    params.bodyCapsuleHalfHeight = myAvatar->getCharacterController()->getCapsuleHalfHeight();
+    params.bodyCapsuleLocalOffset = myAvatar->getCharacterController()->getCapsuleLocalOffset();
 
-    _rig.updateFromHandAndFeetParameters(handAndFeetParams, deltaTime);
+    params.isTalking = head->getTimeWithoutTalking() <= 1.5f;
+
+    _rig.updateFromControllerParameters(params, deltaTime);
 
     Rig::CharacterControllerState ccState = convertCharacterControllerState(myAvatar->getCharacterController()->getState());
 
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 83cac6d9bb..42ceb756b9 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -23,6 +23,7 @@
 #include <gl/OpenGLVersionChecker.h>
 #include <SandboxUtils.h>
 #include <SharedUtil.h>
+#include <NetworkAccessManager.h>
 
 #include "AddressManager.h"
 #include "Application.h"
@@ -71,15 +72,19 @@ int main(int argc, const char* argv[]) {
     QCommandLineOption runServerOption("runServer", "Whether to run the server");
     QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
     QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run");
+    QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
+    QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path");
     parser.addOption(urlOption);
     parser.addOption(noUpdaterOption);
     parser.addOption(checkMinSpecOption);
     parser.addOption(runServerOption);
     parser.addOption(serverContentPathOption);
+    parser.addOption(overrideAppLocalDataPathOption);
+    parser.addOption(overrideScriptsPathOption);
     parser.addOption(allowMultipleInstancesOption);
     parser.parse(arguments);
 
-    
+
     const QString& applicationName = getInterfaceSharedMemoryName();
     bool instanceMightBeRunning = true;
 #ifdef Q_OS_WIN
@@ -96,6 +101,29 @@ int main(int argc, const char* argv[]) {
     if (allowMultipleInstances) {
         instanceMightBeRunning = false;
     }
+    // this needs to be done here in main, as the mechanism for setting the 
+    // scripts directory appears not to work.  See the bug report
+    // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine
+    if (parser.isSet(overrideScriptsPathOption)) {
+        QDir scriptsPath(parser.value(overrideScriptsPathOption));
+        if (scriptsPath.exists()) {
+            PathUtils::defaultScriptsLocation(scriptsPath.path());
+        }
+    }
+
+    if (parser.isSet(overrideAppLocalDataPathOption)) {
+        // get dir to use for cache
+        QString cacheDir = parser.value(overrideAppLocalDataPathOption);
+        if (!cacheDir.isEmpty()) {
+            // tell everyone to use the right cache location
+            //
+            // this handles data8 and prepared
+            DependencyManager::get<ResourceManager>()->setCacheDir(cacheDir);
+
+            // this does the ktx_cache
+            PathUtils::getAppLocalDataPath(cacheDir);
+        }
+    }
 
     if (instanceMightBeRunning) {
         // Try to connect and send message to existing interface instance
@@ -179,7 +207,7 @@ int main(int argc, const char* argv[]) {
         QString openvrDllPath = appPath + "/plugins/openvr.dll";
         HMODULE openvrDll;
         CHECKMINSPECPROC checkMinSpecPtr;
-        if ((openvrDll = LoadLibrary(openvrDllPath.toLocal8Bit().data())) && 
+        if ((openvrDll = LoadLibrary(openvrDllPath.toLocal8Bit().data())) &&
             (checkMinSpecPtr = (CHECKMINSPECPROC)GetProcAddress(openvrDll, "CheckMinSpec"))) {
             if (!checkMinSpecPtr()) {
                 return -1;
diff --git a/libraries/animation/src/AnimDefaultPose.cpp b/libraries/animation/src/AnimDefaultPose.cpp
new file mode 100644
index 0000000000..70bcbe7c21
--- /dev/null
+++ b/libraries/animation/src/AnimDefaultPose.cpp
@@ -0,0 +1,34 @@
+//
+//  AnimDefaultPose.cpp
+//
+//  Created by Anthony J. Thibault on 6/26/17.
+//  Copyright (c) 2017 High Fidelity, Inc. All rights reserved.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "AnimDefaultPose.h"
+
+AnimDefaultPose::AnimDefaultPose(const QString& id) :
+    AnimNode(AnimNode::Type::DefaultPose, id)
+{
+
+}
+
+AnimDefaultPose::~AnimDefaultPose() {
+
+}
+
+const AnimPoseVec& AnimDefaultPose::evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut) {
+    if (_skeleton) {
+        _poses = _skeleton->getRelativeDefaultPoses();
+    } else {
+        _poses.clear();
+    }
+    return _poses;
+}
+
+const AnimPoseVec& AnimDefaultPose::getPosesInternal() const {
+    return _poses;
+}
diff --git a/libraries/animation/src/AnimDefaultPose.h b/libraries/animation/src/AnimDefaultPose.h
new file mode 100644
index 0000000000..eefefac7af
--- /dev/null
+++ b/libraries/animation/src/AnimDefaultPose.h
@@ -0,0 +1,36 @@
+//
+//  AnimDefaultPose.h
+//
+//  Created by Anthony J. Thibault on 6/26/17.
+//  Copyright (c) 2017 High Fidelity, Inc. All rights reserved.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AnimDefaultPose_h
+#define hifi_AnimDefaultPose_h
+
+#include <string>
+#include "AnimNode.h"
+
+// Always returns the default pose of the current skeleton.
+
+class AnimDefaultPose : public AnimNode {
+public:
+    AnimDefaultPose(const QString& id);
+    virtual ~AnimDefaultPose() override;
+
+    virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut) override;
+protected:
+    // for AnimDebugDraw rendering
+    virtual const AnimPoseVec& getPosesInternal() const override;
+
+    AnimPoseVec _poses;
+
+    // no copies
+    AnimDefaultPose(const AnimDefaultPose&) = delete;
+    AnimDefaultPose& operator=(const AnimDefaultPose&) = delete;
+};
+
+#endif // hifi_AnimDefaultPose_h
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 77437e79b9..d7076a443e 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -23,13 +23,40 @@
 #include "CubicHermiteSpline.h"
 #include "AnimUtil.h"
 
+static void lookupJointChainInfo(AnimInverseKinematics::JointChainInfo* jointChainInfos, size_t numJointChainInfos,
+                                 int indexA, int indexB,
+                                 AnimInverseKinematics::JointChainInfo** jointChainInfoA,
+                                 AnimInverseKinematics::JointChainInfo** jointChainInfoB) {
+    *jointChainInfoA = nullptr;
+    *jointChainInfoB = nullptr;
+    for (size_t i = 0; i < numJointChainInfos; i++) {
+        if (jointChainInfos[i].jointIndex == indexA) {
+            *jointChainInfoA = jointChainInfos + i;
+        }
+        if (jointChainInfos[i].jointIndex == indexB) {
+            *jointChainInfoB = jointChainInfos + i;
+        }
+        if (*jointChainInfoA && *jointChainInfoB) {
+            break;
+        }
+    }
+}
+
+static float easeOutExpo(float t) {
+    return 1.0f - powf(2, -10.0f * t);
+}
+
 AnimInverseKinematics::IKTargetVar::IKTargetVar(const QString& jointNameIn, const QString& positionVarIn, const QString& rotationVarIn,
-                                                const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn) :
+                                                const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
+                                                const QString& poleVectorEnabledVarIn, const QString& poleReferenceVectorVarIn, const QString& poleVectorVarIn) :
     jointName(jointNameIn),
     positionVar(positionVarIn),
     rotationVar(rotationVarIn),
     typeVar(typeVarIn),
     weightVar(weightVarIn),
+    poleVectorEnabledVar(poleVectorEnabledVarIn),
+    poleReferenceVectorVar(poleReferenceVectorVarIn),
+    poleVectorVar(poleVectorVarIn),
     weight(weightIn),
     numFlexCoefficients(flexCoefficientsIn.size()),
     jointIndex(-1)
@@ -46,6 +73,9 @@ AnimInverseKinematics::IKTargetVar::IKTargetVar(const IKTargetVar& orig) :
     rotationVar(orig.rotationVar),
     typeVar(orig.typeVar),
     weightVar(orig.weightVar),
+    poleVectorEnabledVar(orig.poleVectorEnabledVar),
+    poleReferenceVectorVar(orig.poleReferenceVectorVar),
+    poleVectorVar(orig.poleVectorVar),
     weight(orig.weight),
     numFlexCoefficients(orig.numFlexCoefficients),
     jointIndex(orig.jointIndex)
@@ -99,8 +129,9 @@ void AnimInverseKinematics::computeAbsolutePoses(AnimPoseVec& absolutePoses) con
 }
 
 void AnimInverseKinematics::setTargetVars(const QString& jointName, const QString& positionVar, const QString& rotationVar,
-                                          const QString& typeVar, const QString& weightVar, float weight, const std::vector<float>& flexCoefficients) {
-    IKTargetVar targetVar(jointName, positionVar, rotationVar, typeVar, weightVar, weight, flexCoefficients);
+                                          const QString& typeVar, const QString& weightVar, float weight, const std::vector<float>& flexCoefficients,
+                                          const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar) {
+    IKTargetVar targetVar(jointName, positionVar, rotationVar, typeVar, weightVar, weight, flexCoefficients, poleVectorEnabledVar, poleReferenceVectorVar, poleVectorVar);
 
     // if there are dups, last one wins.
     bool found = false;
@@ -138,9 +169,9 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std::
             IKTarget target;
             target.setType(animVars.lookup(targetVar.typeVar, (int)IKTarget::Type::RotationAndPosition));
             if (target.getType() != IKTarget::Type::Unknown) {
-                AnimPose defaultPose = _skeleton->getAbsolutePose(targetVar.jointIndex, underPoses);
-                glm::quat rotation = animVars.lookupRigToGeometry(targetVar.rotationVar, defaultPose.rot());
-                glm::vec3 translation = animVars.lookupRigToGeometry(targetVar.positionVar, defaultPose.trans());
+                AnimPose absPose = _skeleton->getAbsolutePose(targetVar.jointIndex, underPoses);
+                glm::quat rotation = animVars.lookupRigToGeometry(targetVar.rotationVar, absPose.rot());
+                glm::vec3 translation = animVars.lookupRigToGeometry(targetVar.positionVar, absPose.trans());
                 float weight = animVars.lookup(targetVar.weightVar, targetVar.weight);
 
                 target.setPose(rotation, translation);
@@ -148,6 +179,15 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std::
                 target.setWeight(weight);
                 target.setFlexCoefficients(targetVar.numFlexCoefficients, targetVar.flexCoefficients);
 
+                bool poleVectorEnabled = animVars.lookup(targetVar.poleVectorEnabledVar, false);
+                target.setPoleVectorEnabled(poleVectorEnabled);
+
+                glm::vec3 poleVector = animVars.lookupRigToGeometryVector(targetVar.poleVectorVar, Vectors::UNIT_Z);
+                target.setPoleVector(glm::normalize(poleVector));
+
+                glm::vec3 poleReferenceVector = animVars.lookupRigToGeometryVector(targetVar.poleReferenceVectorVar, Vectors::UNIT_Z);
+                target.setPoleReferenceVector(glm::normalize(poleReferenceVector));
+
                 targets.push_back(target);
 
                 if (targetVar.jointIndex > _maxTargetIndex) {
@@ -298,7 +338,8 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
     // the tip's parent-relative as we proceed up the chain
     glm::quat tipParentOrientation = absolutePoses[pivotIndex].rot();
 
-    std::map<int, DebugJoint> debugJointMap;
+    const size_t MAX_CHAIN_DEPTH = 30;
+    JointChainInfo jointChainInfos[MAX_CHAIN_DEPTH];
 
     // NOTE: if this code is removed, the head will remain rigid, causing the spine/hips to thrust forward backward
     // as the head is nodded.
@@ -326,15 +367,8 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
             }
         }
 
-        // store the relative rotation change in the accumulator
-        _rotationAccumulators[tipIndex].add(tipRelativeRotation, target.getWeight());
-
         glm::vec3 tipRelativeTranslation = _relativePoses[target.getIndex()].trans();
-        _translationAccumulators[tipIndex].add(tipRelativeTranslation);
-
-        if (debug) {
-            debugJointMap[tipIndex] = DebugJoint(tipRelativeRotation, tipRelativeTranslation, constrained);
-        }
+        jointChainInfos[chainDepth] = { tipRelativeRotation, tipRelativeTranslation, target.getWeight(), tipIndex, constrained };
     }
 
     // cache tip absolute position
@@ -344,6 +378,9 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
 
     // descend toward root, pivoting each joint to get tip closer to target position
     while (pivotIndex != _hipsIndex && pivotsParentIndex != -1) {
+
+        assert(chainDepth < MAX_CHAIN_DEPTH);
+
         // compute the two lines that should be aligned
         glm::vec3 jointPosition = absolutePoses[pivotIndex].trans();
         glm::vec3 leverArm = tipPosition - jointPosition;
@@ -357,6 +394,7 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
             const float MIN_AXIS_LENGTH = 1.0e-4f;
             RotationConstraint* constraint = getConstraint(pivotIndex);
 
+
             // only allow swing on lowerSpine if there is a hips IK target.
             if (_hipsTargetIndex < 0 && constraint && constraint->isLowerSpine() && tipIndex != _headIndex) {
                 // for these types of targets we only allow twist at the lower-spine
@@ -382,6 +420,7 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
                 float cosAngle = glm::clamp(glm::dot(leverArm, targetLine) / (glm::length(leverArm) * glm::length(targetLine)), -1.0f, 1.0f);
                 float angle = acosf(cosAngle);
                 const float MIN_ADJUSTMENT_ANGLE = 1.0e-4f;
+
                 if (angle > MIN_ADJUSTMENT_ANGLE) {
                     // reduce angle by a flexCoefficient
                     angle *= target.getFlexCoefficient(chainDepth);
@@ -440,15 +479,8 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
             }
         }
 
-        // store the relative rotation change in the accumulator
-        _rotationAccumulators[pivotIndex].add(newRot, target.getWeight());
-
         glm::vec3 newTrans = _relativePoses[pivotIndex].trans();
-        _translationAccumulators[pivotIndex].add(newTrans);
-
-        if (debug) {
-            debugJointMap[pivotIndex] = DebugJoint(newRot, newTrans, constrained);
-        }
+        jointChainInfos[chainDepth] = { newRot, newTrans, target.getWeight(), pivotIndex, constrained };
 
         // keep track of tip's new transform as we descend towards root
         tipPosition = jointPosition + deltaRotation * (tipPosition - jointPosition);
@@ -461,8 +493,127 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
         chainDepth++;
     }
 
+    if (target.getPoleVectorEnabled()) {
+        int topJointIndex = target.getIndex();
+        int midJointIndex = _skeleton->getParentIndex(topJointIndex);
+        if (midJointIndex != -1) {
+            int baseJointIndex = _skeleton->getParentIndex(midJointIndex);
+            if (baseJointIndex != -1) {
+                int baseParentJointIndex = _skeleton->getParentIndex(baseJointIndex);
+                AnimPose topPose, midPose, basePose;
+                int topChainIndex = -1, baseChainIndex = -1;
+                AnimPose postAbsPoses[MAX_CHAIN_DEPTH];
+                AnimPose accum = absolutePoses[_hipsIndex];
+                AnimPose baseParentPose = absolutePoses[_hipsIndex];
+                for (int i = (int)chainDepth - 1; i >= 0; i--) {
+                    accum = accum * AnimPose(glm::vec3(1.0f), jointChainInfos[i].relRot, jointChainInfos[i].relTrans);
+                    postAbsPoses[i] = accum;
+                    if (jointChainInfos[i].jointIndex == topJointIndex) {
+                        topChainIndex = i;
+                        topPose = accum;
+                    }
+                    if (jointChainInfos[i].jointIndex == midJointIndex) {
+                        midPose = accum;
+                    }
+                    if (jointChainInfos[i].jointIndex == baseJointIndex) {
+                        baseChainIndex = i;
+                        basePose = accum;
+                    }
+                    if (jointChainInfos[i].jointIndex == baseParentJointIndex) {
+                        baseParentPose = accum;
+                    }
+                }
+
+                glm::quat poleRot = Quaternions::IDENTITY;
+                glm::vec3 d = basePose.trans() - topPose.trans();
+                float dLen = glm::length(d);
+                if (dLen > EPSILON) {
+                    glm::vec3 dUnit = d / dLen;
+                    glm::vec3 e = midPose.xformVector(target.getPoleReferenceVector());
+                    glm::vec3 eProj = e - glm::dot(e, dUnit) * dUnit;
+                    float eProjLen = glm::length(eProj);
+
+                    const float MIN_EPROJ_LEN = 0.5f;
+                    if (eProjLen < MIN_EPROJ_LEN) {
+                        glm::vec3 midPoint = topPose.trans() + d * 0.5f;
+                        e = midPose.trans() - midPoint;
+                        eProj = e - glm::dot(e, dUnit) * dUnit;
+                        eProjLen = glm::length(eProj);
+                    }
+
+                    glm::vec3 p = target.getPoleVector();
+                    glm::vec3 pProj = p - glm::dot(p, dUnit) * dUnit;
+                    float pProjLen = glm::length(pProj);
+
+                    if (eProjLen > EPSILON && pProjLen > EPSILON) {
+                        // as pProjLen become orthognal to d, reduce the amount of rotation.
+                        float magnitude = easeOutExpo(pProjLen);
+                        float dot = glm::clamp(glm::dot(eProj / eProjLen, pProj / pProjLen), 0.0f, 1.0f);
+                        float theta = acosf(dot);
+                        glm::vec3 cross = glm::cross(eProj, pProj);
+                        const float MIN_ADJUSTMENT_ANGLE = 0.001745f;  // 0.1 degree
+                        if (theta > MIN_ADJUSTMENT_ANGLE) {
+                            glm::vec3 axis = dUnit;
+                            if (glm::dot(cross, dUnit) < 0) {
+                                axis = -dUnit;
+                            }
+                            poleRot = glm::angleAxis(magnitude * theta, axis);
+                        }
+                    }
+                }
+
+                if (debug) {
+                    const vec4 RED(1.0f, 0.0f, 0.0f, 1.0f);
+                    const vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f);
+                    const vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
+                    const vec4 YELLOW(1.0f, 1.0f, 0.0f, 1.0f);
+                    const vec4 WHITE(1.0f, 1.0f, 1.0f, 1.0f);
+
+                    AnimPose geomToWorldPose = AnimPose(context.getRigToWorldMatrix() * context.getGeometryToRigMatrix());
+
+                    glm::vec3 dUnit = d / dLen;
+                    glm::vec3 e = midPose.xformVector(target.getPoleReferenceVector());
+                    glm::vec3 eProj = e - glm::dot(e, dUnit) * dUnit;
+                    float eProjLen = glm::length(eProj);
+                    const float MIN_EPROJ_LEN = 0.5f;
+                    if (eProjLen < MIN_EPROJ_LEN) {
+                        glm::vec3 midPoint = topPose.trans() + d * 0.5f;
+                        e = midPose.trans() - midPoint;
+                        eProj = e - glm::dot(e, dUnit) * dUnit;
+                        eProjLen = glm::length(eProj);
+                    }
+
+                    glm::vec3 p = target.getPoleVector();
+                    const float PROJ_VECTOR_LEN = 10.0f;
+                    const float POLE_VECTOR_LEN = 100.0f;
+                    glm::vec3 midPoint = (basePose.trans() + topPose.trans()) * 0.5f;
+                    DebugDraw::getInstance().drawRay(geomToWorldPose.xformPoint(basePose.trans()),
+                                                     geomToWorldPose.xformPoint(topPose.trans()),
+                                                     YELLOW);
+                    DebugDraw::getInstance().drawRay(geomToWorldPose.xformPoint(midPoint),
+                                                     geomToWorldPose.xformPoint(midPoint + PROJ_VECTOR_LEN * glm::normalize(e)),
+                                                     RED);
+                    DebugDraw::getInstance().drawRay(geomToWorldPose.xformPoint(midPoint),
+                                                     geomToWorldPose.xformPoint(midPoint + POLE_VECTOR_LEN * glm::normalize(p)),
+                                                     BLUE);
+                }
+
+                glm::quat newBaseRelRot = glm::inverse(baseParentPose.rot()) * poleRot * basePose.rot();
+                jointChainInfos[baseChainIndex].relRot = newBaseRelRot;
+
+                glm::quat newTopRelRot = glm::inverse(midPose.rot()) * glm::inverse(poleRot) * topPose.rot();
+                jointChainInfos[topChainIndex].relRot = newTopRelRot;
+            }
+        }
+    }
+
+    for (size_t i = 0; i < chainDepth; i++) {
+        _rotationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relRot, jointChainInfos[i].weight);
+        _translationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relTrans, jointChainInfos[i].weight);
+    }
+
     if (debug) {
-        debugDrawIKChain(debugJointMap, context);
+        debugDrawIKChain(jointChainInfos, chainDepth, context);
     }
 }
 
@@ -548,7 +699,8 @@ const std::vector<AnimInverseKinematics::SplineJointInfo>* AnimInverseKinematics
 
 void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug) {
 
-    std::map<int, DebugJoint> debugJointMap;
+    const size_t MAX_CHAIN_DEPTH = 30;
+    JointChainInfo jointChainInfos[MAX_CHAIN_DEPTH];
 
     const int baseIndex = _hipsIndex;
 
@@ -608,7 +760,6 @@ void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, co
             ::blend(1, &absolutePoses[splineJointInfo.jointIndex], &desiredAbsPose, target.getFlexCoefficient(i), &flexedAbsPose);
 
             AnimPose relPose = parentAbsPose.inverse() * flexedAbsPose;
-            _rotationAccumulators[splineJointInfo.jointIndex].add(relPose.rot(), target.getWeight());
 
             bool constrained = false;
             if (splineJointInfo.jointIndex != _hipsIndex) {
@@ -632,18 +783,19 @@ void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, co
                 }
             }
 
-            _translationAccumulators[splineJointInfo.jointIndex].add(relPose.trans(), target.getWeight());
-
-            if (debug) {
-                debugJointMap[splineJointInfo.jointIndex] = DebugJoint(relPose.rot(), relPose.trans(), constrained);
-            }
+            jointChainInfos[i] = { relPose.rot(), relPose.trans(), target.getWeight(), splineJointInfo.jointIndex, constrained };
 
             parentAbsPose = flexedAbsPose;
         }
     }
 
+    for (size_t i = 0; i < splineJointInfoVec->size(); i++) {
+        _rotationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relRot, jointChainInfos[i].weight);
+        _translationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relTrans, jointChainInfos[i].weight);
+    }
+
     if (debug) {
-        debugDrawIKChain(debugJointMap, context);
+        debugDrawIKChain(jointChainInfos, splineJointInfoVec->size(), context);
     }
 }
 
@@ -654,6 +806,7 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
     return _relativePoses;
 }
 
+
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut, const AnimPoseVec& underPoses) {
     // allows solutionSource to be overridden by an animVar
@@ -717,9 +870,9 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
                         float scaleFactor = ((offsetLength - MIN_HIPS_OFFSET_LENGTH) / offsetLength);
                         glm::vec3 hipsOffset = scaleFactor * _hipsOffset;
                         if (_hipsParentIndex == -1) {
-                            _relativePoses[_hipsIndex].trans() = underPoses[_hipsIndex].trans() + hipsOffset;
+                            _relativePoses[_hipsIndex].trans() = _relativePoses[_hipsIndex].trans() + hipsOffset;
                         } else {
-                            auto absHipsPose = _skeleton->getAbsolutePose(_hipsIndex, underPoses);
+                            auto absHipsPose = _skeleton->getAbsolutePose(_hipsIndex, _relativePoses);
                             absHipsPose.trans() += hipsOffset;
                             _relativePoses[_hipsIndex] = _skeleton->getAbsolutePose(_hipsParentIndex, _relativePoses).inverse() * absHipsPose;
                         }
@@ -767,6 +920,7 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
 
             {
                 PROFILE_RANGE_EX(simulation_animation, "ik/ccd", 0xffff00ff, 0);
+                preconditionRelativePosesToAvoidLimbLock(context, targets);
                 solve(context, targets);
             }
 
@@ -921,7 +1075,7 @@ void AnimInverseKinematics::initConstraints() {
     //         y                |
     //         |                |
     //         |            O---O---O RightUpLeg
-    //      z  |            | Hips2 |
+    //      z  |            | Hips  |
     //       \ |            |       |
     //        \|            |       |
     //  x -----+            O       O RightLeg
@@ -966,7 +1120,9 @@ void AnimInverseKinematics::initConstraints() {
         if (0 == baseName.compare("Arm", Qt::CaseSensitive)) {
             SwingTwistConstraint* stConstraint = new SwingTwistConstraint();
             stConstraint->setReferenceRotation(_defaultRelativePoses[i].rot());
-            stConstraint->setTwistLimits(-PI / 2.0f, PI / 2.0f);
+            //stConstraint->setTwistLimits(-PI / 2.0f, PI / 2.0f);
+            const float TWIST_LIMIT = 5.0f * PI / 8.0f;
+            stConstraint->setTwistLimits(-TWIST_LIMIT, TWIST_LIMIT);
 
             /* KEEP THIS CODE for future experimentation
             // these directions are approximate swing limits in root-frame
@@ -992,7 +1148,7 @@ void AnimInverseKinematics::initConstraints() {
 
             // simple cone
             std::vector<float> minDots;
-            const float MAX_HAND_SWING = PI / 2.0f;
+            const float MAX_HAND_SWING = 5.0f * PI / 8.0f;
             minDots.push_back(cosf(MAX_HAND_SWING));
             stConstraint->setSwingLimits(minDots);
 
@@ -1000,7 +1156,7 @@ void AnimInverseKinematics::initConstraints() {
         } else if (0 == baseName.compare("UpLeg", Qt::CaseSensitive)) {
             SwingTwistConstraint* stConstraint = new SwingTwistConstraint();
             stConstraint->setReferenceRotation(_defaultRelativePoses[i].rot());
-            stConstraint->setTwistLimits(-PI / 4.0f, PI / 4.0f);
+            stConstraint->setTwistLimits(-PI / 2.0f, PI / 2.0f);
 
             std::vector<glm::vec3> swungDirections;
             float deltaTheta = PI / 4.0f;
@@ -1142,7 +1298,7 @@ void AnimInverseKinematics::initConstraints() {
             // we determine the max/min angles by rotating the swing limit lines from parent- to child-frame
             // then measure the angles to swing the yAxis into alignment
             glm::vec3 hingeAxis = - mirror * Vectors::UNIT_Z;
-            const float MIN_ELBOW_ANGLE = 0.05f;
+            const float MIN_ELBOW_ANGLE = 0.0f;
             const float MAX_ELBOW_ANGLE = 11.0f * PI / 12.0f;
             glm::quat invReferenceRotation = glm::inverse(referenceRotation);
             glm::vec3 minSwingAxis = invReferenceRotation * glm::angleAxis(MIN_ELBOW_ANGLE, hingeAxis) * Vectors::UNIT_Y;
@@ -1173,8 +1329,8 @@ void AnimInverseKinematics::initConstraints() {
 
             // we determine the max/min angles by rotating the swing limit lines from parent- to child-frame
             // then measure the angles to swing the yAxis into alignment
-            const float MIN_KNEE_ANGLE = 0.097f;  // ~5 deg
-            const float MAX_KNEE_ANGLE = 7.0f * PI / 8.0f;
+            const float MIN_KNEE_ANGLE = 0.0f;
+            const float MAX_KNEE_ANGLE = 7.0f * PI / 8.0f; // 157.5 deg
             glm::quat invReferenceRotation = glm::inverse(referenceRotation);
             glm::vec3 minSwingAxis = invReferenceRotation * glm::angleAxis(MIN_KNEE_ANGLE, hingeAxis) * Vectors::UNIT_Y;
             glm::vec3 maxSwingAxis = invReferenceRotation * glm::angleAxis(MAX_KNEE_ANGLE, hingeAxis) * Vectors::UNIT_Y;
@@ -1308,6 +1464,7 @@ void AnimInverseKinematics::debugDrawRelativePoses(const AnimContext& context) c
     // convert relative poses to absolute
     _skeleton->convertRelativePosesToAbsolute(poses);
 
+
     mat4 geomToWorldMatrix = context.getRigToWorldMatrix() * context.getGeometryToRigMatrix();
 
     const vec4 RED(1.0f, 0.0f, 0.0f, 1.0f);
@@ -1338,13 +1495,14 @@ void AnimInverseKinematics::debugDrawRelativePoses(const AnimContext& context) c
     }
 }
 
-void AnimInverseKinematics::debugDrawIKChain(std::map<int, DebugJoint>& debugJointMap, const AnimContext& context) const {
+void AnimInverseKinematics::debugDrawIKChain(JointChainInfo* jointChainInfos, size_t numJointChainInfos, const AnimContext& context) const {
     AnimPoseVec poses = _relativePoses;
 
     // copy debug joint rotations into the relative poses
-    for (auto& debugJoint : debugJointMap) {
-        poses[debugJoint.first].rot() = debugJoint.second.relRot;
-        poses[debugJoint.first].trans() = debugJoint.second.relTrans;
+    for (size_t i = 0; i < numJointChainInfos; i++) {
+        const JointChainInfo& info = jointChainInfos[i];
+        poses[info.jointIndex].rot() = info.relRot;
+        poses[info.jointIndex].trans() = info.relTrans;
     }
 
     // convert relative poses to absolute
@@ -1360,11 +1518,11 @@ void AnimInverseKinematics::debugDrawIKChain(std::map<int, DebugJoint>& debugJoi
 
     // draw each pose
     for (int i = 0; i < (int)poses.size(); i++) {
-
-        // only draw joints that are actually in debugJointMap, or their parents
-        auto iter = debugJointMap.find(i);
-        auto parentIter = debugJointMap.find(_skeleton->getParentIndex(i));
-        if (iter != debugJointMap.end() || parentIter != debugJointMap.end()) {
+        int parentIndex = _skeleton->getParentIndex(i);
+        JointChainInfo* jointInfo = nullptr;
+        JointChainInfo* parentJointInfo = nullptr;
+        lookupJointChainInfo(jointChainInfos, numJointChainInfos, i, parentIndex, &jointInfo, &parentJointInfo);
+        if (jointInfo && parentJointInfo) {
 
             // transform local axes into world space.
             auto pose = poses[i];
@@ -1377,13 +1535,12 @@ void AnimInverseKinematics::debugDrawIKChain(std::map<int, DebugJoint>& debugJoi
             DebugDraw::getInstance().drawRay(pos, pos + AXIS_LENGTH * zAxis, BLUE);
 
             // draw line to parent
-            int parentIndex = _skeleton->getParentIndex(i);
             if (parentIndex != -1) {
                 glm::vec3 parentPos = transformPoint(geomToWorldMatrix, poses[parentIndex].trans());
                 glm::vec4 color = GRAY;
 
                 // draw constrained joints with a RED link to their parent.
-                if (parentIter != debugJointMap.end() && parentIter->second.constrained) {
+                if (parentJointInfo->constrained) {
                     color = RED;
                 }
                 DebugDraw::getInstance().drawRay(pos, parentPos, color);
@@ -1486,7 +1643,7 @@ void AnimInverseKinematics::debugDrawConstraints(const AnimContext& context) con
                             glm::vec3 worldSwungAxis = transformVectorFast(geomToWorldMatrix, parentAbsRot * refRot * swungAxis);
                             glm::vec3 swingTip = pos + SWING_LENGTH * worldSwungAxis;
 
-                            float prevPhi = acos(swingTwistConstraint->getMinDots()[j]);
+                            float prevPhi = acosf(swingTwistConstraint->getMinDots()[j]);
                             float prevTheta = theta - D_THETA;
                             glm::vec3 prevSwungAxis = sphericalToCartesian(prevPhi, prevTheta - PI_2);
                             glm::vec3 prevWorldSwungAxis = transformVectorFast(geomToWorldMatrix, parentAbsRot * refRot * prevSwungAxis);
@@ -1521,6 +1678,50 @@ void AnimInverseKinematics::blendToPoses(const AnimPoseVec& targetPoses, const A
     }
 }
 
+void AnimInverseKinematics::preconditionRelativePosesToAvoidLimbLock(const AnimContext& context, const std::vector<IKTarget>& targets) {
+    const int NUM_LIMBS = 4;
+    std::pair<int, int> limbs[NUM_LIMBS] = {
+        {_skeleton->nameToJointIndex("LeftHand"), _skeleton->nameToJointIndex("LeftArm")},
+        {_skeleton->nameToJointIndex("RightHand"), _skeleton->nameToJointIndex("RightArm")},
+        {_skeleton->nameToJointIndex("LeftFoot"), _skeleton->nameToJointIndex("LeftUpLeg")},
+        {_skeleton->nameToJointIndex("RightFoot"), _skeleton->nameToJointIndex("RightUpLeg")}
+    };
+    const float MIN_AXIS_LENGTH = 1.0e-4f;
+
+    for (auto& target : targets) {
+        if (target.getIndex() != -1) {
+            for (int i = 0; i < NUM_LIMBS; i++) {
+                if (limbs[i].first == target.getIndex()) {
+                    int tipIndex = limbs[i].first;
+                    int baseIndex = limbs[i].second;
+
+                    // TODO: as an optimization, these poses can be computed in one pass down the chain, instead of three.
+                    AnimPose tipPose = _skeleton->getAbsolutePose(tipIndex, _relativePoses);
+                    AnimPose basePose = _skeleton->getAbsolutePose(baseIndex, _relativePoses);
+                    AnimPose baseParentPose = _skeleton->getAbsolutePose(_skeleton->getParentIndex(baseIndex), _relativePoses);
+
+                    // to help reduce limb locking, and to help the CCD solver converge faster
+                    // rotate the limbs leverArm over the targetLine.
+                    glm::vec3 targetLine = target.getTranslation() - basePose.trans();
+                    glm::vec3 leverArm = tipPose.trans() - basePose.trans();
+                    glm::vec3 axis = glm::cross(leverArm, targetLine);
+                    float axisLength = glm::length(axis);
+                    if (axisLength > MIN_AXIS_LENGTH) {
+                        // compute angle of rotation that brings tip to target
+                        axis /= axisLength;
+                        float cosAngle = glm::clamp(glm::dot(leverArm, targetLine) / (glm::length(leverArm) * glm::length(targetLine)), -1.0f, 1.0f);
+                        float angle = acosf(cosAngle);
+                        glm::quat newBaseRotation = glm::angleAxis(angle, axis) * basePose.rot();
+
+                        // convert base rotation into relative space of base.
+                        _relativePoses[baseIndex].rot() = glm::inverse(baseParentPose.rot()) * newBaseRotation;
+                    }
+                }
+            }
+        }
+    }
+}
+
 void AnimInverseKinematics::initRelativePosesFromSolutionSource(SolutionSource solutionSource, const AnimPoseVec& underPoses) {
     const float RELAX_BLEND_FACTOR = (1.0f / 16.0f);
     const float COPY_BLEND_FACTOR = 1.0f;
@@ -1531,6 +1732,10 @@ void AnimInverseKinematics::initRelativePosesFromSolutionSource(SolutionSource s
         break;
     case SolutionSource::RelaxToLimitCenterPoses:
         blendToPoses(_limitCenterPoses, underPoses, RELAX_BLEND_FACTOR);
+        // special case for hips: copy over hips pose whether or not IK is enabled.
+        if (_hipsIndex >= 0 && _hipsIndex < (int)_relativePoses.size()) {
+            _relativePoses[_hipsIndex] = _limitCenterPoses[_hipsIndex];
+        }
         break;
     case SolutionSource::PreviousSolution:
         // do nothing... _relativePoses is already the previous solution
@@ -1540,7 +1745,7 @@ void AnimInverseKinematics::initRelativePosesFromSolutionSource(SolutionSource s
         break;
     case SolutionSource::LimitCenterPoses:
         // essentially copy limitCenterPoses over to _relativePoses.
-        blendToPoses(_limitCenterPoses, underPoses, COPY_BLEND_FACTOR);
+        blendToPoses(underPoses, _limitCenterPoses, COPY_BLEND_FACTOR);
         break;
     }
 }
diff --git a/libraries/animation/src/AnimInverseKinematics.h b/libraries/animation/src/AnimInverseKinematics.h
index cc919c1684..d473ae3698 100644
--- a/libraries/animation/src/AnimInverseKinematics.h
+++ b/libraries/animation/src/AnimInverseKinematics.h
@@ -26,6 +26,14 @@ class RotationConstraint;
 class AnimInverseKinematics : public AnimNode {
 public:
 
+    struct JointChainInfo {
+        glm::quat relRot;
+        glm::vec3 relTrans;
+        float weight;
+        int jointIndex;
+        bool constrained;
+    };
+
     explicit AnimInverseKinematics(const QString& id);
     virtual ~AnimInverseKinematics() override;
 
@@ -34,7 +42,8 @@ public:
     void computeAbsolutePoses(AnimPoseVec& absolutePoses) const;
 
     void setTargetVars(const QString& jointName, const QString& positionVar, const QString& rotationVar,
-                       const QString& typeVar, const QString& weightVar, float weight, const std::vector<float>& flexCoefficients);
+                       const QString& typeVar, const QString& weightVar, float weight, const std::vector<float>& flexCoefficients,
+                       const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
 
     virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimNode::Triggers& triggersOut) override;
     virtual const AnimPoseVec& overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut, const AnimPoseVec& underPoses) override;
@@ -67,19 +76,13 @@ protected:
     void solveTargetWithCCD(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug);
     void solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug);
     virtual void setSkeletonInternal(AnimSkeleton::ConstPointer skeleton) override;
-    struct DebugJoint {
-        DebugJoint() : relRot(), constrained(false) {}
-        DebugJoint(const glm::quat& relRotIn, const glm::vec3& relTransIn, bool constrainedIn) : relRot(relRotIn), relTrans(relTransIn), constrained(constrainedIn) {}
-        glm::quat relRot;
-        glm::vec3 relTrans;
-        bool constrained;
-    };
-    void debugDrawIKChain(std::map<int, DebugJoint>& debugJointMap, const AnimContext& context) const;
+    void debugDrawIKChain(JointChainInfo* jointChainInfos, size_t numJointChainInfos, const AnimContext& context) const;
     void debugDrawRelativePoses(const AnimContext& context) const;
     void debugDrawConstraints(const AnimContext& context) const;
     void debugDrawSpineSplines(const AnimContext& context, const std::vector<IKTarget>& targets) const;
     void initRelativePosesFromSolutionSource(SolutionSource solutionSource, const AnimPoseVec& underPose);
     void blendToPoses(const AnimPoseVec& targetPoses, const AnimPoseVec& underPose, float blendFactor);
+    void preconditionRelativePosesToAvoidLimbLock(const AnimContext& context, const std::vector<IKTarget>& targets);
 
     // used to pre-compute information about each joint influeced by a spline IK target.
     struct SplineJointInfo {
@@ -107,7 +110,8 @@ protected:
     enum FlexCoefficients { MAX_FLEX_COEFFICIENTS = 10 };
     struct IKTargetVar {
         IKTargetVar(const QString& jointNameIn, const QString& positionVarIn, const QString& rotationVarIn,
-                    const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn);
+                    const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
+                    const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
         IKTargetVar(const IKTargetVar& orig);
 
         QString jointName;
@@ -115,6 +119,9 @@ protected:
         QString rotationVar;
         QString typeVar;
         QString weightVar;
+        QString poleVectorEnabledVar;
+        QString poleReferenceVectorVar;
+        QString poleVectorVar;
         float weight;
         float flexCoefficients[MAX_FLEX_COEFFICIENTS];
         size_t numFlexCoefficients;
diff --git a/libraries/animation/src/AnimNode.h b/libraries/animation/src/AnimNode.h
index 10db38f42e..6d9d35b19b 100644
--- a/libraries/animation/src/AnimNode.h
+++ b/libraries/animation/src/AnimNode.h
@@ -44,6 +44,7 @@ public:
         StateMachine,
         Manipulator,
         InverseKinematics,
+        DefaultPose,
         NumTypes
     };
     using Pointer = std::shared_ptr<AnimNode>;
diff --git a/libraries/animation/src/AnimNodeLoader.cpp b/libraries/animation/src/AnimNodeLoader.cpp
index 44ed8c6053..33f3d72756 100644
--- a/libraries/animation/src/AnimNodeLoader.cpp
+++ b/libraries/animation/src/AnimNodeLoader.cpp
@@ -23,6 +23,7 @@
 #include "AnimStateMachine.h"
 #include "AnimManipulator.h"
 #include "AnimInverseKinematics.h"
+#include "AnimDefaultPose.h"
 
 using NodeLoaderFunc = AnimNode::Pointer (*)(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 using NodeProcessFunc = bool (*)(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
@@ -35,6 +36,7 @@ static AnimNode::Pointer loadOverlayNode(const QJsonObject& jsonObj, const QStri
 static AnimNode::Pointer loadStateMachineNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 static AnimNode::Pointer loadManipulatorNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 static AnimNode::Pointer loadInverseKinematicsNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
+static AnimNode::Pointer loadDefaultPoseNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 
 // called after children have been loaded
 // returns node on success, nullptr on failure.
@@ -50,6 +52,7 @@ static const char* animNodeTypeToString(AnimNode::Type type) {
     case AnimNode::Type::StateMachine: return "stateMachine";
     case AnimNode::Type::Manipulator: return "manipulator";
     case AnimNode::Type::InverseKinematics: return "inverseKinematics";
+    case AnimNode::Type::DefaultPose: return "defaultPose";
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -109,6 +112,7 @@ static NodeLoaderFunc animNodeTypeToLoaderFunc(AnimNode::Type type) {
     case AnimNode::Type::StateMachine: return loadStateMachineNode;
     case AnimNode::Type::Manipulator: return loadManipulatorNode;
     case AnimNode::Type::InverseKinematics: return loadInverseKinematicsNode;
+    case AnimNode::Type::DefaultPose: return loadDefaultPoseNode;
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -123,6 +127,7 @@ static NodeProcessFunc animNodeTypeToProcessFunc(AnimNode::Type type) {
     case AnimNode::Type::StateMachine: return processStateMachineNode;
     case AnimNode::Type::Manipulator: return processDoNothing;
     case AnimNode::Type::InverseKinematics: return processDoNothing;
+    case AnimNode::Type::DefaultPose: return processDoNothing;
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -347,7 +352,8 @@ static const char* boneSetStrings[AnimOverlay::NumBoneSets] = {
     "empty",
     "leftHand",
     "rightHand",
-    "hipsOnly"
+    "hipsOnly",
+    "bothFeet"
 };
 
 static AnimOverlay::BoneSet stringToBoneSetEnum(const QString& str) {
@@ -479,6 +485,9 @@ AnimNode::Pointer loadInverseKinematicsNode(const QJsonObject& jsonObj, const QS
         READ_OPTIONAL_STRING(typeVar, targetObj);
         READ_OPTIONAL_STRING(weightVar, targetObj);
         READ_OPTIONAL_FLOAT(weight, targetObj, 1.0f);
+        READ_OPTIONAL_STRING(poleVectorEnabledVar, targetObj);
+        READ_OPTIONAL_STRING(poleReferenceVectorVar, targetObj);
+        READ_OPTIONAL_STRING(poleVectorVar, targetObj);
 
         auto flexCoefficientsValue = targetObj.value("flexCoefficients");
         if (!flexCoefficientsValue.isArray()) {
@@ -491,7 +500,7 @@ AnimNode::Pointer loadInverseKinematicsNode(const QJsonObject& jsonObj, const QS
             flexCoefficients.push_back((float)value.toDouble());
         }
 
-        node->setTargetVars(jointName, positionVar, rotationVar, typeVar, weightVar, weight, flexCoefficients);
+        node->setTargetVars(jointName, positionVar, rotationVar, typeVar, weightVar, weight, flexCoefficients, poleVectorEnabledVar, poleReferenceVectorVar, poleVectorVar);
     };
 
     READ_OPTIONAL_STRING(solutionSource, jsonObj);
@@ -514,6 +523,11 @@ AnimNode::Pointer loadInverseKinematicsNode(const QJsonObject& jsonObj, const QS
     return node;
 }
 
+static AnimNode::Pointer loadDefaultPoseNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl) {
+    auto node = std::make_shared<AnimDefaultPose>(id);
+    return node;
+}
+
 void buildChildMap(std::map<QString, int>& map, AnimNode::Pointer node) {
     for (int i = 0; i < (int)node->getChildCount(); ++i) {
         map.insert(std::pair<QString, int>(node->getChild(i)->getID(), i));
diff --git a/libraries/animation/src/AnimOverlay.cpp b/libraries/animation/src/AnimOverlay.cpp
index e086413dde..10594af20a 100644
--- a/libraries/animation/src/AnimOverlay.cpp
+++ b/libraries/animation/src/AnimOverlay.cpp
@@ -35,6 +35,7 @@ void AnimOverlay::buildBoneSet(BoneSet boneSet) {
     case LeftHandBoneSet: buildLeftHandBoneSet(); break;
     case RightHandBoneSet: buildRightHandBoneSet(); break;
     case HipsOnlyBoneSet: buildHipsOnlyBoneSet(); break;
+    case BothFeetBoneSet: buildBothFeetBoneSet(); break;
     default:
     case EmptyBoneSet: buildEmptyBoneSet(); break;
     }
@@ -196,6 +197,20 @@ void AnimOverlay::buildHipsOnlyBoneSet() {
     _boneSetVec[hipsJoint] = 1.0f;
 }
 
+void AnimOverlay::buildBothFeetBoneSet() {
+    assert(_skeleton);
+    buildEmptyBoneSet();
+    int rightFoot = _skeleton->nameToJointIndex("RightFoot");
+    for_each_child_joint(_skeleton, rightFoot, [&](int i) {
+        _boneSetVec[i] = 1.0f;
+    });
+    int leftFoot = _skeleton->nameToJointIndex("LeftFoot");
+    for_each_child_joint(_skeleton, leftFoot, [&](int i) {
+        _boneSetVec[i] = 1.0f;
+    });
+}
+
+
 // for AnimDebugDraw rendering
 const AnimPoseVec& AnimOverlay::getPosesInternal() const {
     return _poses;
diff --git a/libraries/animation/src/AnimOverlay.h b/libraries/animation/src/AnimOverlay.h
index ed9439feb7..8b6e1529fc 100644
--- a/libraries/animation/src/AnimOverlay.h
+++ b/libraries/animation/src/AnimOverlay.h
@@ -38,6 +38,7 @@ public:
         LeftHandBoneSet,
         RightHandBoneSet,
         HipsOnlyBoneSet,
+        BothFeetBoneSet,
         NumBoneSets
     };
 
@@ -77,6 +78,7 @@ public:
     void buildLeftHandBoneSet();
     void buildRightHandBoneSet();
     void buildHipsOnlyBoneSet();
+    void buildBothFeetBoneSet();
 
     // no copies
     AnimOverlay(const AnimOverlay&) = delete;
diff --git a/libraries/animation/src/AnimPose.h b/libraries/animation/src/AnimPose.h
index a2e22a24be..2df3d1f2e4 100644
--- a/libraries/animation/src/AnimPose.h
+++ b/libraries/animation/src/AnimPose.h
@@ -21,6 +21,8 @@ class AnimPose {
 public:
     AnimPose() {}
     explicit AnimPose(const glm::mat4& mat);
+    explicit AnimPose(const glm::quat& rotIn) : _scale(1.0f), _rot(rotIn), _trans(0.0f) {}
+    AnimPose(const glm::quat& rotIn, const glm::vec3& transIn) : _scale(1.0f), _rot(rotIn), _trans(transIn) {}
     AnimPose(const glm::vec3& scaleIn, const glm::quat& rotIn, const glm::vec3& transIn) : _scale(scaleIn), _rot(rotIn), _trans(transIn) {}
     static const AnimPose identity;
 
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index 350fe8a534..062e016660 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -76,11 +76,11 @@ const QString& AnimSkeleton::getJointName(int jointIndex) const {
     return _joints[jointIndex].name;
 }
 
-AnimPose AnimSkeleton::getAbsolutePose(int jointIndex, const AnimPoseVec& poses) const {
-    if (jointIndex < 0 || jointIndex >= (int)poses.size() || jointIndex >= _jointsSize) {
+AnimPose AnimSkeleton::getAbsolutePose(int jointIndex, const AnimPoseVec& relativePoses) const {
+    if (jointIndex < 0 || jointIndex >= (int)relativePoses.size() || jointIndex >= _jointsSize) {
         return AnimPose::identity;
     } else {
-        return getAbsolutePose(_joints[jointIndex].parentIndex, poses) * poses[jointIndex];
+        return getAbsolutePose(_joints[jointIndex].parentIndex, relativePoses) * relativePoses[jointIndex];
     }
 }
 
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 0988c26bdb..6315f2d62b 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -50,7 +50,7 @@ public:
 
     int getParentIndex(int jointIndex) const;
 
-    AnimPose getAbsolutePose(int jointIndex, const AnimPoseVec& poses) const;
+    AnimPose getAbsolutePose(int jointIndex, const AnimPoseVec& relativePoses) const;
 
     void convertRelativePosesToAbsolute(AnimPoseVec& poses) const;
     void convertAbsolutePosesToRelative(AnimPoseVec& poses) const;
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index 6594482085..7d4c0f4e92 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -144,38 +144,3 @@ void Animation::animationParseError(int error, QString str) {
     finishedLoading(false);
 }
 
-AnimationDetails::AnimationDetails() :
-    role(), url(), fps(0.0f), priority(0.0f), loop(false), hold(false), 
-    startAutomatically(false), firstFrame(0.0f), lastFrame(0.0f), running(false), currentFrame(0.0f) 
-{
-}
-
-AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
-    bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame) :
-    role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold), 
-    startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame), 
-    running(running), currentFrame(currentFrame) 
-{ 
-}
-
-
-QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& details) {
-    QScriptValue obj = engine->newObject();
-    obj.setProperty("role", details.role);
-    obj.setProperty("url", details.url.toString());
-    obj.setProperty("fps", details.fps);
-    obj.setProperty("priority", details.priority);
-    obj.setProperty("loop", details.loop);
-    obj.setProperty("hold", details.hold);
-    obj.setProperty("startAutomatically", details.startAutomatically);
-    obj.setProperty("firstFrame", details.firstFrame);
-    obj.setProperty("lastFrame", details.lastFrame);
-    obj.setProperty("running", details.running);
-    obj.setProperty("currentFrame", details.currentFrame);
-    return obj;
-}
-
-void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& details) {
-    // nothing for now...
-}
-
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index 0e6a94c1b8..490bb7dcd8 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -107,26 +107,5 @@ private:
     QByteArray _data;
 };
 
-class AnimationDetails {
-public:
-    AnimationDetails();
-    AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
-        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame);
-
-    QString role;
-    QUrl url;
-    float fps;
-    float priority;
-    bool loop;
-    bool hold;
-    bool startAutomatically;
-    float firstFrame;
-    float lastFrame;
-    bool running;
-    float currentFrame;
-};
-Q_DECLARE_METATYPE(AnimationDetails);
-QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& event);
-void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& event);
 
 #endif // hifi_AnimationCache_h
diff --git a/libraries/animation/src/IKTarget.h b/libraries/animation/src/IKTarget.h
index 011175aedf..5567539659 100644
--- a/libraries/animation/src/IKTarget.h
+++ b/libraries/animation/src/IKTarget.h
@@ -30,10 +30,16 @@ public:
     const glm::vec3& getTranslation() const { return _pose.trans(); }
     const glm::quat& getRotation() const { return _pose.rot(); }
     const AnimPose& getPose() const { return _pose; }
+    glm::vec3 getPoleVector() const { return _poleVector; }
+    glm::vec3 getPoleReferenceVector() const { return _poleReferenceVector; }
+    bool getPoleVectorEnabled() const { return _poleVectorEnabled; }
     int getIndex() const { return _index; }
     Type getType() const { return _type; }
 
     void setPose(const glm::quat& rotation, const glm::vec3& translation);
+    void setPoleVector(const glm::vec3& poleVector) { _poleVector = poleVector; }
+    void setPoleReferenceVector(const glm::vec3& poleReferenceVector) { _poleReferenceVector = poleReferenceVector; }
+    void setPoleVectorEnabled(bool poleVectorEnabled) { _poleVectorEnabled = poleVectorEnabled; }
     void setIndex(int index) { _index = index; }
     void setType(int);
     void setFlexCoefficients(size_t numFlexCoefficientsIn, const float* flexCoefficientsIn);
@@ -46,8 +52,11 @@ public:
 
 private:
     AnimPose _pose;
-    int _index{-1};
-    Type _type{Type::RotationAndPosition};
+    glm::vec3 _poleVector;
+    glm::vec3 _poleReferenceVector;
+    bool _poleVectorEnabled { false };
+    int _index { -1 };
+    Type _type { Type::RotationAndPosition };
     float _weight;
     float _flexCoefficients[MAX_FLEX_COEFFICIENTS];
     size_t _numFlexCoefficients;
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index fbb3d24298..3d04b0b26f 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -27,6 +27,7 @@
 #include "AnimationLogging.h"
 #include "AnimClip.h"
 #include "AnimInverseKinematics.h"
+#include "AnimOverlay.h"
 #include "AnimSkeleton.h"
 #include "AnimUtil.h"
 #include "IKTarget.h"
@@ -479,12 +480,6 @@ bool Rig::getAbsoluteJointPoseInRigFrame(int jointIndex, AnimPose& returnPose) c
     }
 }
 
-bool Rig::getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const {
-    // AJT: TODO: used by attachments
-    ASSERT(false);
-    return false;
-}
-
 void Rig::calcAnimAlpha(float speed, const std::vector<float>& referenceSpeeds, float* alphaOut) const {
 
     ASSERT(referenceSpeeds.size() > 0);
@@ -950,6 +945,7 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons
 
         // evaluate the animation
         AnimNode::Triggers triggersOut;
+
         _internalPoseSet._relativePoses = _animNode->evaluate(_animVars, context, deltaTime, triggersOut);
         if ((int)_internalPoseSet._relativePoses.size() != _animSkeleton->getNumJoints()) {
             // animations haven't fully loaded yet.
@@ -1015,46 +1011,6 @@ glm::quat Rig::getJointDefaultRotationInParentFrame(int jointIndex) {
     return glm::quat();
 }
 
-void Rig::updateFromHeadParameters(const HeadParameters& params, float dt) {
-    updateHeadAnimVars(params);
-
-    _animVars.set("isTalking", params.isTalking);
-    _animVars.set("notIsTalking", !params.isTalking);
-
-    if (params.hipsEnabled) {
-        _animVars.set("solutionSource", (int)AnimInverseKinematics::SolutionSource::RelaxToLimitCenterPoses);
-        _animVars.set("hipsType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("hipsPosition", extractTranslation(params.hipsMatrix));
-        _animVars.set("hipsRotation", glmExtractRotation(params.hipsMatrix));
-    } else {
-        _animVars.set("solutionSource", (int)AnimInverseKinematics::SolutionSource::RelaxToUnderPoses);
-        _animVars.set("hipsType", (int)IKTarget::Type::Unknown);
-    }
-
-    if (params.hipsEnabled && params.spine2Enabled) {
-        _animVars.set("spine2Type", (int)IKTarget::Type::Spline);
-        _animVars.set("spine2Position", extractTranslation(params.spine2Matrix));
-        _animVars.set("spine2Rotation", glmExtractRotation(params.spine2Matrix));
-    } else {
-        _animVars.set("spine2Type", (int)IKTarget::Type::Unknown);
-    }
-
-    if (params.leftArmEnabled) {
-        _animVars.set("leftArmType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("leftArmPosition", params.leftArmPosition);
-        _animVars.set("leftArmRotation", params.leftArmRotation);
-    } else {
-        _animVars.set("leftArmType", (int)IKTarget::Type::Unknown);
-    }
-
-    if (params.rightArmEnabled) {
-        _animVars.set("rightArmType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("rightArmPosition", params.rightArmPosition);
-        _animVars.set("rightArmRotation", params.rightArmRotation);
-    } else {
-        _animVars.set("rightArmType", (int)IKTarget::Type::Unknown);
-    }
-}
 
 void Rig::updateFromEyeParameters(const EyeParameters& params) {
     updateEyeJoint(params.leftEyeJointIndex, params.modelTranslation, params.modelRotation, params.eyeLookAt, params.eyeSaccade);
@@ -1086,12 +1042,12 @@ void Rig::computeHeadFromHMD(const AnimPose& hmdPose, glm::vec3& headPositionOut
     headOrientationOut = hmdOrientation;
 }
 
-void Rig::updateHeadAnimVars(const HeadParameters& params) {
+void Rig::updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headPose) {
     if (_animSkeleton) {
-        if (params.headEnabled) {
-            _animVars.set("headPosition", params.rigHeadPosition);
-            _animVars.set("headRotation", params.rigHeadOrientation);
-            if (params.hipsEnabled) {
+        if (headEnabled) {
+            _animVars.set("headPosition", headPose.trans());
+            _animVars.set("headRotation", headPose.rot());
+            if (hipsEnabled) {
                 // Since there is an explicit hips ik target, switch the head to use the more flexible Spline IK chain type.
                 // this will allow the spine to compress/expand and bend more natrually, ensuring that it can reach the head target position.
                 _animVars.set("headType", (int)IKTarget::Type::Spline);
@@ -1104,12 +1060,271 @@ void Rig::updateHeadAnimVars(const HeadParameters& params) {
             }
         } else {
             _animVars.unset("headPosition");
-            _animVars.set("headRotation", params.rigHeadOrientation);
+            _animVars.set("headRotation", headPose.rot());
             _animVars.set("headType", (int)IKTarget::Type::RotationOnly);
         }
     }
 }
 
+void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
+                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
+                      float bodyCapsuleRadius, float bodyCapsuleHalfHeight, const glm::vec3& bodyCapsuleLocalOffset) {
+
+    // Use this capsule to represent the avatar body.
+    int hipsIndex = indexOfJoint("Hips");
+    glm::vec3 hipsTrans;
+    if (hipsIndex >= 0) {
+        hipsTrans = _internalPoseSet._absolutePoses[hipsIndex].trans();
+    }
+
+    const glm::vec3 bodyCapsuleCenter = hipsTrans - bodyCapsuleLocalOffset;
+    const glm::vec3 bodyCapsuleStart = bodyCapsuleCenter - glm::vec3(0, bodyCapsuleHalfHeight, 0);
+    const glm::vec3 bodyCapsuleEnd = bodyCapsuleCenter + glm::vec3(0, bodyCapsuleHalfHeight, 0);
+
+    const float HAND_RADIUS = 0.05f;
+
+    const float RELAX_DURATION = 0.6f;
+    const float CONTROL_DURATION = 0.4f;
+    const bool TO_CONTROLLED = true;
+    const bool FROM_CONTROLLED = false;
+    const bool LEFT_HAND = true;
+    const bool RIGHT_HAND = false;
+
+    const float ELBOW_POLE_VECTOR_BLEND_FACTOR = 0.95f;
+
+    if (leftHandEnabled) {
+        if (!_isLeftHandControlled) {
+            _leftHandControlTimeRemaining = CONTROL_DURATION;
+            _isLeftHandControlled = true;
+        }
+
+        glm::vec3 handPosition = leftHandPose.trans();
+        glm::quat handRotation = leftHandPose.rot();
+
+        if (_leftHandControlTimeRemaining > 0.0f) {
+            // Move hand from non-controlled position to controlled position.
+            _leftHandControlTimeRemaining = std::max(_leftHandControlTimeRemaining - dt, 0.0f);
+            AnimPose handPose(Vectors::ONE, handRotation, handPosition);
+            if (transitionHandPose(_leftHandControlTimeRemaining, CONTROL_DURATION, handPose,
+                                   LEFT_HAND, TO_CONTROLLED, handPose)) {
+                handPosition = handPose.trans();
+                handRotation = handPose.rot();
+            }
+        }
+
+        if (!hipsEnabled) {
+            // prevent the hand IK targets from intersecting the body capsule
+            glm::vec3 displacement;
+            if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
+                handPosition -= displacement;
+            }
+        }
+
+        _animVars.set("leftHandPosition", handPosition);
+        _animVars.set("leftHandRotation", handRotation);
+        _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
+
+        _lastLeftHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
+        _isLeftHandControlled = true;
+
+        // compute pole vector
+        int handJointIndex = _animSkeleton->nameToJointIndex("LeftHand");
+        int armJointIndex = _animSkeleton->nameToJointIndex("LeftArm");
+        int elbowJointIndex = _animSkeleton->nameToJointIndex("LeftForeArm");
+        if (!leftArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
+            glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, true);
+
+            // smooth toward desired pole vector from previous pole vector...  to reduce jitter
+            if (!_prevLeftHandPoleVectorValid) {
+                _prevLeftHandPoleVectorValid = true;
+                _prevLeftHandPoleVector = poleVector;
+            }
+            glm::quat deltaRot = rotationBetween(_prevLeftHandPoleVector, poleVector);
+            glm::quat smoothDeltaRot = safeMix(deltaRot, Quaternions::IDENTITY, ELBOW_POLE_VECTOR_BLEND_FACTOR);
+            _prevLeftHandPoleVector = smoothDeltaRot * _prevLeftHandPoleVector;
+
+            _animVars.set("leftHandPoleVectorEnabled", true);
+            _animVars.set("leftHandPoleReferenceVector", Vectors::UNIT_X);
+            _animVars.set("leftHandPoleVector", _prevLeftHandPoleVector);
+        } else {
+            _prevLeftHandPoleVectorValid = false;
+            _animVars.set("leftHandPoleVectorEnabled", false);
+        }
+    } else {
+        _prevLeftHandPoleVectorValid = false;
+        _animVars.set("leftHandPoleVectorEnabled", false);
+
+        if (_isLeftHandControlled) {
+            _leftHandRelaxTimeRemaining = RELAX_DURATION;
+            _isLeftHandControlled = false;
+        }
+
+        if (_leftHandRelaxTimeRemaining > 0.0f) {
+            // Move hand from controlled position to non-controlled position.
+            _leftHandRelaxTimeRemaining = std::max(_leftHandRelaxTimeRemaining - dt, 0.0f);
+            AnimPose handPose;
+            if (transitionHandPose(_leftHandRelaxTimeRemaining, RELAX_DURATION, _lastLeftHandControlledPose,
+                                   LEFT_HAND, FROM_CONTROLLED, handPose)) {
+                _animVars.set("leftHandPosition", handPose.trans());
+                _animVars.set("leftHandRotation", handPose.rot());
+                _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
+            }
+        } else {
+            _animVars.unset("leftHandPosition");
+            _animVars.unset("leftHandRotation");
+            _animVars.set("leftHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
+        }
+    }
+
+    if (rightHandEnabled) {
+        if (!_isRightHandControlled) {
+            _rightHandControlTimeRemaining = CONTROL_DURATION;
+            _isRightHandControlled = true;
+        }
+
+        glm::vec3 handPosition = rightHandPose.trans();
+        glm::quat handRotation = rightHandPose.rot();
+
+        if (_rightHandControlTimeRemaining > 0.0f) {
+            // Move hand from non-controlled position to controlled position.
+            _rightHandControlTimeRemaining = std::max(_rightHandControlTimeRemaining - dt, 0.0f);
+            AnimPose handPose(Vectors::ONE, handRotation, handPosition);
+            if (transitionHandPose(_rightHandControlTimeRemaining, CONTROL_DURATION, handPose, RIGHT_HAND, TO_CONTROLLED, handPose)) {
+                handPosition = handPose.trans();
+                handRotation = handPose.rot();
+            }
+        }
+
+        if (!hipsEnabled) {
+            // prevent the hand IK targets from intersecting the body capsule
+            glm::vec3 displacement;
+            if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
+                handPosition -= displacement;
+            }
+        }
+
+        _animVars.set("rightHandPosition", handPosition);
+        _animVars.set("rightHandRotation", handRotation);
+        _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
+
+        _lastRightHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
+        _isRightHandControlled = true;
+
+        // compute pole vector
+        int handJointIndex = _animSkeleton->nameToJointIndex("RightHand");
+        int armJointIndex = _animSkeleton->nameToJointIndex("RightArm");
+        int elbowJointIndex = _animSkeleton->nameToJointIndex("RightForeArm");
+        if (!rightArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
+            glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, false);
+
+            // smooth toward desired pole vector from previous pole vector...  to reduce jitter
+            if (!_prevRightHandPoleVectorValid) {
+                _prevRightHandPoleVectorValid = true;
+                _prevRightHandPoleVector = poleVector;
+            }
+            glm::quat deltaRot = rotationBetween(_prevRightHandPoleVector, poleVector);
+            glm::quat smoothDeltaRot = safeMix(deltaRot, Quaternions::IDENTITY, ELBOW_POLE_VECTOR_BLEND_FACTOR);
+            _prevRightHandPoleVector = smoothDeltaRot * _prevRightHandPoleVector;
+
+            _animVars.set("rightHandPoleVectorEnabled", true);
+            _animVars.set("rightHandPoleReferenceVector", -Vectors::UNIT_X);
+            _animVars.set("rightHandPoleVector", _prevRightHandPoleVector);
+        } else {
+            _prevRightHandPoleVectorValid = false;
+            _animVars.set("rightHandPoleVectorEnabled", false);
+        }
+    } else {
+        _prevRightHandPoleVectorValid = false;
+        _animVars.set("rightHandPoleVectorEnabled", false);
+
+        if (_isRightHandControlled) {
+            _rightHandRelaxTimeRemaining = RELAX_DURATION;
+            _isRightHandControlled = false;
+        }
+
+        if (_rightHandRelaxTimeRemaining > 0.0f) {
+            // Move hand from controlled position to non-controlled position.
+            _rightHandRelaxTimeRemaining = std::max(_rightHandRelaxTimeRemaining - dt, 0.0f);
+            AnimPose handPose;
+            if (transitionHandPose(_rightHandRelaxTimeRemaining, RELAX_DURATION, _lastRightHandControlledPose, RIGHT_HAND, FROM_CONTROLLED, handPose)) {
+                _animVars.set("rightHandPosition", handPose.trans());
+                _animVars.set("rightHandRotation", handPose.rot());
+                _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
+            }
+        } else {
+            _animVars.unset("rightHandPosition");
+            _animVars.unset("rightHandRotation");
+            _animVars.set("rightHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
+        }
+    }
+}
+
+void Rig::updateFeet(bool leftFootEnabled, bool rightFootEnabled, const AnimPose& leftFootPose, const AnimPose& rightFootPose) {
+
+    const float KNEE_POLE_VECTOR_BLEND_FACTOR = 0.95f;
+
+    int hipsIndex = indexOfJoint("Hips");
+
+    if (leftFootEnabled) {
+        _animVars.set("leftFootPosition", leftFootPose.trans());
+        _animVars.set("leftFootRotation", leftFootPose.rot());
+        _animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
+
+        int footJointIndex = _animSkeleton->nameToJointIndex("LeftFoot");
+        int kneeJointIndex = _animSkeleton->nameToJointIndex("LeftLeg");
+        int upLegJointIndex = _animSkeleton->nameToJointIndex("LeftUpLeg");
+        glm::vec3 poleVector = calculateKneePoleVector(footJointIndex, kneeJointIndex, upLegJointIndex, hipsIndex, leftFootPose);
+
+        // smooth toward desired pole vector from previous pole vector...  to reduce jitter
+        if (!_prevLeftFootPoleVectorValid) {
+            _prevLeftFootPoleVectorValid = true;
+            _prevLeftFootPoleVector = poleVector;
+        }
+        glm::quat deltaRot = rotationBetween(_prevLeftFootPoleVector, poleVector);
+        glm::quat smoothDeltaRot = safeMix(deltaRot, Quaternions::IDENTITY, KNEE_POLE_VECTOR_BLEND_FACTOR);
+        _prevLeftFootPoleVector = smoothDeltaRot * _prevLeftFootPoleVector;
+
+        _animVars.set("leftFootPoleVectorEnabled", true);
+        _animVars.set("leftFootPoleReferenceVector", Vectors::UNIT_Z);
+        _animVars.set("leftFootPoleVector", _prevLeftFootPoleVector);
+    } else {
+        _animVars.unset("leftFootPosition");
+        _animVars.unset("leftFootRotation");
+        _animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
+        _animVars.set("leftFootPoleVectorEnabled", false);
+        _prevLeftFootPoleVectorValid = false;
+    }
+
+    if (rightFootEnabled) {
+        _animVars.set("rightFootPosition", rightFootPose.trans());
+        _animVars.set("rightFootRotation", rightFootPose.rot());
+        _animVars.set("rightFootType", (int)IKTarget::Type::RotationAndPosition);
+
+        int footJointIndex = _animSkeleton->nameToJointIndex("RightFoot");
+        int kneeJointIndex = _animSkeleton->nameToJointIndex("RightLeg");
+        int upLegJointIndex = _animSkeleton->nameToJointIndex("RightUpLeg");
+        glm::vec3 poleVector = calculateKneePoleVector(footJointIndex, kneeJointIndex, upLegJointIndex, hipsIndex, rightFootPose);
+
+        // smooth toward desired pole vector from previous pole vector...  to reduce jitter
+        if (!_prevRightFootPoleVectorValid) {
+            _prevRightFootPoleVectorValid = true;
+            _prevRightFootPoleVector = poleVector;
+        }
+        glm::quat deltaRot = rotationBetween(_prevRightFootPoleVector, poleVector);
+        glm::quat smoothDeltaRot = safeMix(deltaRot, Quaternions::IDENTITY, KNEE_POLE_VECTOR_BLEND_FACTOR);
+        _prevRightFootPoleVector = smoothDeltaRot * _prevRightFootPoleVector;
+
+        _animVars.set("rightFootPoleVectorEnabled", true);
+        _animVars.set("rightFootPoleReferenceVector", Vectors::UNIT_Z);
+        _animVars.set("rightFootPoleVector", _prevRightFootPoleVector);
+    } else {
+        _animVars.unset("rightFootPosition");
+        _animVars.unset("rightFootRotation");
+        _animVars.set("rightFootPoleVectorEnabled", false);
+        _animVars.set("rightFootType", (int)IKTarget::Type::RotationAndPosition);
+    }
+}
+
 void Rig::updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm::quat& modelRotation, const glm::vec3& lookAtSpot, const glm::vec3& saccade) {
 
     // TODO: does not properly handle avatar scale.
@@ -1145,162 +1360,153 @@ void Rig::updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm
     }
 }
 
-void Rig::updateFromHandAndFeetParameters(const HandAndFeetParameters& params, float dt) {
-    if (_animSkeleton && _animNode) {
-        const float HAND_RADIUS = 0.05f;
-        int hipsIndex = indexOfJoint("Hips");
-        glm::vec3 hipsTrans;
-        if (hipsIndex >= 0) {
-            hipsTrans = _internalPoseSet._absolutePoses[hipsIndex].trans();
-        }
+static glm::quat quatLerp(const glm::quat& q1, const glm::quat& q2, float alpha) {
+    float dot = glm::dot(q1, q2);
+    glm::quat temp;
+    if (dot < 0.0f) {
+        temp = -q2;
+    } else {
+        temp = q2;
+    }
+    return glm::normalize(glm::lerp(q1, temp, alpha));
+}
 
-        // Use this capsule to represent the avatar body.
-        const float bodyCapsuleRadius = params.bodyCapsuleRadius;
-        const glm::vec3 bodyCapsuleCenter = hipsTrans - params.bodyCapsuleLocalOffset;
-        const glm::vec3 bodyCapsuleStart = bodyCapsuleCenter - glm::vec3(0, params.bodyCapsuleHalfHeight, 0);
-        const glm::vec3 bodyCapsuleEnd = bodyCapsuleCenter + glm::vec3(0, params.bodyCapsuleHalfHeight, 0);
+glm::vec3 Rig::calculateElbowPoleVector(int handIndex, int elbowIndex, int armIndex, int hipsIndex, bool isLeft) const {
+    AnimPose hipsPose = _externalPoseSet._absolutePoses[hipsIndex];
+    AnimPose handPose = _externalPoseSet._absolutePoses[handIndex];
+    AnimPose elbowPose = _externalPoseSet._absolutePoses[elbowIndex];
+    AnimPose armPose = _externalPoseSet._absolutePoses[armIndex];
 
-        // TODO: add isHipsEnabled
-        bool bodySensorTrackingEnabled = params.isLeftFootEnabled || params.isRightFootEnabled;
+    // ray from hand to arm.
+    glm::vec3 d = glm::normalize(handPose.trans() - armPose.trans());
 
-        const float RELAX_DURATION = 0.6f;
-        const float CONTROL_DURATION = 0.4f;
-        const bool TO_CONTROLLED = true;
-        const bool FROM_CONTROLLED = false;
-        const bool LEFT_HAND = true;
-        const bool RIGHT_HAND = false;
+    float sign = isLeft ? 1.0f : -1.0f;
 
-        if (params.isLeftEnabled) {
-            if (!_isLeftHandControlled) {
-                _leftHandControlTimeRemaining = CONTROL_DURATION;
-                _isLeftHandControlled = true;
-            }
+    // form a plane normal to the hips x-axis.
+    glm::vec3 n = hipsPose.rot() * Vectors::UNIT_X;
+    glm::vec3 y = hipsPose.rot() * Vectors::UNIT_Y;
 
-            glm::vec3 handPosition = params.leftPosition;
-            glm::quat handRotation = params.leftOrientation;
+    // project d onto this plane
+    glm::vec3 dProj = d - glm::dot(d, n) * n;
 
-            if (_leftHandControlTimeRemaining > 0.0f) {
-                // Move hand from non-controlled position to controlled position.
-                _leftHandControlTimeRemaining = std::max(_leftHandControlTimeRemaining - dt, 0.0f);
-                AnimPose handPose(Vectors::ONE, handRotation, handPosition);
-                if (transitionHandPose(_leftHandControlTimeRemaining, CONTROL_DURATION, handPose, LEFT_HAND, TO_CONTROLLED, 
-                        handPose)) {
-                    handPosition = handPose.trans();
-                    handRotation = handPose.rot();
-                }
-            }
+    // give dProj a bit of offset away from the body.
+    float avatarScale = extractUniformScale(_modelOffset);
+    const float LATERAL_OFFSET = 1.0f * avatarScale;
+    const float VERTICAL_OFFSET = -0.333f * avatarScale;
+    glm::vec3 dProjWithOffset = dProj + sign * LATERAL_OFFSET * n + y * VERTICAL_OFFSET;
 
-            if (!bodySensorTrackingEnabled) {
-                // prevent the hand IK targets from intersecting the body capsule
-                glm::vec3 displacement;
-                if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
-                    handPosition -= displacement;
-                }
-            }
+    // rotate dProj by 90 degrees to get the poleVector.
+    glm::vec3 poleVector = glm::angleAxis(PI / 2.0f, n) * dProjWithOffset;
 
-            _animVars.set("leftHandPosition", handPosition);
-            _animVars.set("leftHandRotation", handRotation);
-            _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
+    // blend the wrist oreintation into the pole vector to reduce the painfully bent wrist problem.
+    glm::quat elbowToHandDelta = handPose.rot() * glm::inverse(elbowPose.rot());
+    const float WRIST_POLE_ADJUST_FACTOR = 0.5f;
+    glm::quat poleAdjust = quatLerp(Quaternions::IDENTITY, elbowToHandDelta, WRIST_POLE_ADJUST_FACTOR);
 
-            _lastLeftHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
-        } else {
-            if (_isLeftHandControlled) {
-                _leftHandRelaxTimeRemaining = RELAX_DURATION;
-                _isLeftHandControlled = false;
-            }
+    return glm::normalize(poleAdjust * poleVector);
+}
 
-            if (_leftHandRelaxTimeRemaining > 0.0f) {
-                // Move hand from controlled position to non-controlled position.
-                _leftHandRelaxTimeRemaining = std::max(_leftHandRelaxTimeRemaining - dt, 0.0f);
-                AnimPose handPose;
-                if (transitionHandPose(_leftHandRelaxTimeRemaining, RELAX_DURATION, _lastLeftHandControlledPose, LEFT_HAND, 
-                        FROM_CONTROLLED, handPose)) {
-                    _animVars.set("leftHandPosition", handPose.trans());
-                    _animVars.set("leftHandRotation", handPose.rot());
-                    _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
-                }
-            } else {
-                _animVars.unset("leftHandPosition");
-                _animVars.unset("leftHandRotation");
-                _animVars.set("leftHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
-            }
-        }
+glm::vec3 Rig::calculateKneePoleVector(int footJointIndex, int kneeIndex, int upLegIndex, int hipsIndex, const AnimPose& targetFootPose) const {
 
-        if (params.isRightEnabled) {
-            if (!_isRightHandControlled) {
-                _rightHandControlTimeRemaining = CONTROL_DURATION;
-                _isRightHandControlled = true;
-            }
+    AnimPose hipsPose = _externalPoseSet._absolutePoses[hipsIndex];
+    AnimPose footPose = targetFootPose;
+    AnimPose kneePose = _externalPoseSet._absolutePoses[kneeIndex];
+    AnimPose upLegPose = _externalPoseSet._absolutePoses[upLegIndex];
 
-            glm::vec3 handPosition = params.rightPosition;
-            glm::quat handRotation = params.rightOrientation;
+    // ray from foot to upLeg
+    glm::vec3 d = glm::normalize(footPose.trans() - upLegPose.trans());
 
-            if (_rightHandControlTimeRemaining > 0.0f) {
-                // Move hand from non-controlled position to controlled position.
-                _rightHandControlTimeRemaining = std::max(_rightHandControlTimeRemaining - dt, 0.0f);
-                AnimPose handPose(Vectors::ONE, handRotation, handPosition);
-                if (transitionHandPose(_rightHandControlTimeRemaining, CONTROL_DURATION, handPose, RIGHT_HAND, TO_CONTROLLED, 
-                        handPose)) {
-                    handPosition = handPose.trans();
-                    handRotation = handPose.rot();
-                }
-            }
+    // form a plane normal to the hips x-axis
+    glm::vec3 n = hipsPose.rot() * Vectors::UNIT_X;
 
-            if (!bodySensorTrackingEnabled) {
-                // prevent the hand IK targets from intersecting the body capsule
-                glm::vec3 displacement;
-                if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
-                    handPosition -= displacement;
-                }
-            }
+    // project d onto this plane
+    glm::vec3 dProj = d - glm::dot(d, n) * n;
 
-            _animVars.set("rightHandPosition", handPosition);
-            _animVars.set("rightHandRotation", handRotation);
-            _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
+    // rotate dProj by 90 degrees to get the poleVector.
+    glm::vec3 poleVector = glm::angleAxis(-PI / 2.0f, n) * dProj;
 
-            _lastRightHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
-        } else {
-            if (_isRightHandControlled) {
-                _rightHandRelaxTimeRemaining = RELAX_DURATION;
-                _isRightHandControlled = false;
-            }
+    // blend the foot oreintation into the pole vector
+    glm::quat kneeToFootDelta = footPose.rot() * glm::inverse(kneePose.rot());
+    const float WRIST_POLE_ADJUST_FACTOR = 0.5f;
+    glm::quat poleAdjust = quatLerp(Quaternions::IDENTITY, kneeToFootDelta, WRIST_POLE_ADJUST_FACTOR);
 
-            if (_rightHandRelaxTimeRemaining > 0.0f) {
-                // Move hand from controlled position to non-controlled position.
-                _rightHandRelaxTimeRemaining = std::max(_rightHandRelaxTimeRemaining - dt, 0.0f);
-                AnimPose handPose;
-                if (transitionHandPose(_rightHandRelaxTimeRemaining, RELAX_DURATION, _lastRightHandControlledPose, RIGHT_HAND, 
-                        FROM_CONTROLLED, handPose)) {
-                    _animVars.set("rightHandPosition", handPose.trans());
-                    _animVars.set("rightHandRotation", handPose.rot());
-                    _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
-                }
-            } else {
-                _animVars.unset("rightHandPosition");
-                _animVars.unset("rightHandRotation");
-                _animVars.set("rightHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
-            }
-        }
+    return glm::normalize(poleAdjust * poleVector);
+}
 
-        if (params.isLeftFootEnabled) {
-            _animVars.set("leftFootPosition", params.leftFootPosition);
-            _animVars.set("leftFootRotation", params.leftFootOrientation);
-            _animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
-        } else {
-            _animVars.unset("leftFootPosition");
-            _animVars.unset("leftFootRotation");
-            _animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
-        }
+void Rig::updateFromControllerParameters(const ControllerParameters& params, float dt) {
+    if (!_animSkeleton || !_animNode) {
+        return;
+    }
 
-        if (params.isRightFootEnabled) {
-            _animVars.set("rightFootPosition", params.rightFootPosition);
-            _animVars.set("rightFootRotation", params.rightFootOrientation);
-            _animVars.set("rightFootType", (int)IKTarget::Type::RotationAndPosition);
-        } else {
-            _animVars.unset("rightFootPosition");
-            _animVars.unset("rightFootRotation");
-            _animVars.set("rightFootType", (int)IKTarget::Type::RotationAndPosition);
-        }
+    _animVars.set("isTalking", params.isTalking);
+    _animVars.set("notIsTalking", !params.isTalking);
+
+    bool headEnabled = params.controllerActiveFlags[ControllerType_Head];
+    bool leftHandEnabled = params.controllerActiveFlags[ControllerType_LeftHand];
+    bool rightHandEnabled = params.controllerActiveFlags[ControllerType_RightHand];
+    bool hipsEnabled = params.controllerActiveFlags[ControllerType_Hips];
+    bool leftFootEnabled = params.controllerActiveFlags[ControllerType_LeftFoot];
+    bool rightFootEnabled = params.controllerActiveFlags[ControllerType_RightFoot];
+    bool leftArmEnabled = params.controllerActiveFlags[ControllerType_LeftArm];
+    bool rightArmEnabled = params.controllerActiveFlags[ControllerType_RightArm];
+    bool spine2Enabled = params.controllerActiveFlags[ControllerType_Spine2];
+
+    updateHead(headEnabled, hipsEnabled, params.controllerPoses[ControllerType_Head]);
+
+    updateHands(leftHandEnabled, rightHandEnabled, hipsEnabled, leftArmEnabled, rightArmEnabled, dt,
+                params.controllerPoses[ControllerType_LeftHand], params.controllerPoses[ControllerType_RightHand],
+                params.bodyCapsuleRadius, params.bodyCapsuleHalfHeight, params.bodyCapsuleLocalOffset);
+
+    updateFeet(leftFootEnabled, rightFootEnabled,
+               params.controllerPoses[ControllerType_LeftFoot], params.controllerPoses[ControllerType_RightFoot]);
+
+    // if the hips or the feet are being controlled.
+    if (hipsEnabled || rightFootEnabled || leftFootEnabled) {
+        // for more predictable IK solve from the center of the joint limits, not from the underpose
+        _animVars.set("solutionSource", (int)AnimInverseKinematics::SolutionSource::RelaxToLimitCenterPoses);
+
+        // replace the feet animation with the default pose, this is to prevent unexpected toe wiggling.
+        _animVars.set("defaultPoseOverlayAlpha", 1.0f);
+        _animVars.set("defaultPoseOverlayBoneSet", (int)AnimOverlay::BothFeetBoneSet);
+    } else {
+        // augment the IK with the underPose.
+        _animVars.set("solutionSource", (int)AnimInverseKinematics::SolutionSource::RelaxToUnderPoses);
+
+        // feet should follow source animation
+        _animVars.unset("defaultPoseOverlayAlpha");
+        _animVars.unset("defaultPoseOverlayBoneSet");
+    }
+
+    if (hipsEnabled) {
+        _animVars.set("hipsType", (int)IKTarget::Type::RotationAndPosition);
+        _animVars.set("hipsPosition", params.controllerPoses[ControllerType_Hips].trans());
+        _animVars.set("hipsRotation", params.controllerPoses[ControllerType_Hips].rot());
+    } else {
+        _animVars.set("hipsType", (int)IKTarget::Type::Unknown);
+    }
+
+    if (hipsEnabled && spine2Enabled) {
+        _animVars.set("spine2Type", (int)IKTarget::Type::Spline);
+        _animVars.set("spine2Position", params.controllerPoses[ControllerType_Spine2].trans());
+        _animVars.set("spine2Rotation", params.controllerPoses[ControllerType_Spine2].rot());
+    } else {
+        _animVars.set("spine2Type", (int)IKTarget::Type::Unknown);
+    }
+
+    if (leftArmEnabled) {
+        _animVars.set("leftArmType", (int)IKTarget::Type::RotationAndPosition);
+        _animVars.set("leftArmPosition", params.controllerPoses[ControllerType_LeftArm].trans());
+        _animVars.set("leftArmRotation", params.controllerPoses[ControllerType_LeftArm].rot());
+    } else {
+        _animVars.set("leftArmType", (int)IKTarget::Type::Unknown);
+    }
+
+    if (rightArmEnabled) {
+        _animVars.set("rightArmType", (int)IKTarget::Type::RotationAndPosition);
+        _animVars.set("rightArmPosition", params.controllerPoses[ControllerType_RightArm].trans());
+        _animVars.set("rightArmRotation", params.controllerPoses[ControllerType_RightArm].rot());
+    } else {
+        _animVars.set("rightArmType", (int)IKTarget::Type::Unknown);
     }
 }
 
@@ -1486,22 +1692,18 @@ void Rig::computeAvatarBoundingCapsule(
     AnimInverseKinematics ikNode("boundingShape");
     ikNode.setSkeleton(_animSkeleton);
 
-    ikNode.setTargetVars("LeftHand",
-                         "leftHandPosition",
-                         "leftHandRotation",
-                         "leftHandType", "leftHandWeight", 1.0f, {});
-    ikNode.setTargetVars("RightHand",
-                         "rightHandPosition",
-                         "rightHandRotation",
-                         "rightHandType", "rightHandWeight", 1.0f, {});
-    ikNode.setTargetVars("LeftFoot",
-                         "leftFootPosition",
-                         "leftFootRotation",
-                         "leftFootType", "leftFootWeight", 1.0f, {});
-    ikNode.setTargetVars("RightFoot",
-                         "rightFootPosition",
-                         "rightFootRotation",
-                         "rightFootType", "rightFootWeight", 1.0f, {});
+    ikNode.setTargetVars("LeftHand", "leftHandPosition", "leftHandRotation",
+                         "leftHandType", "leftHandWeight", 1.0f, {},
+                         QString(), QString(), QString());
+    ikNode.setTargetVars("RightHand", "rightHandPosition", "rightHandRotation",
+                         "rightHandType", "rightHandWeight", 1.0f, {},
+                         QString(), QString(), QString());
+    ikNode.setTargetVars("LeftFoot", "leftFootPosition", "leftFootRotation",
+                         "leftFootType", "leftFootWeight", 1.0f, {},
+                         QString(), QString(), QString());
+    ikNode.setTargetVars("RightFoot", "rightFootPosition", "rightFootRotation",
+                         "rightFootType", "rightFootWeight", 1.0f, {},
+                         QString(), QString(), QString());
 
     AnimPose geometryToRig = _modelOffset * _geometryOffset;
 
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index b5b69fc018..c17a7b9c8f 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -41,21 +41,26 @@ public:
         bool useNames;
     };
 
-    struct HeadParameters {
-        glm::mat4 hipsMatrix = glm::mat4();           // rig space
-        glm::mat4 spine2Matrix = glm::mat4();         // rig space
-        glm::quat rigHeadOrientation = glm::quat();   // rig space (-z forward)
-        glm::vec3 rigHeadPosition = glm::vec3();      // rig space
-        glm::vec3 rightArmPosition = glm::vec3();     // rig space
-        glm::quat rightArmRotation = glm::quat();     // rig space
-        glm::vec3 leftArmPosition = glm::vec3();      // rig space
-        glm::quat leftArmRotation = glm::quat();      // rig space
-        bool hipsEnabled = false;
-        bool headEnabled = false;
-        bool spine2Enabled = false;
-        bool leftArmEnabled = false;
-        bool rightArmEnabled = false;
-        bool isTalking = false;
+    enum ControllerType {
+        ControllerType_Head = 0,
+        ControllerType_LeftHand,
+        ControllerType_RightHand,
+        ControllerType_Hips,
+        ControllerType_LeftFoot,
+        ControllerType_RightFoot,
+        ControllerType_LeftArm,
+        ControllerType_RightArm,
+        ControllerType_Spine2,
+        NumControllerTypes
+    };
+
+    struct ControllerParameters {
+        AnimPose controllerPoses[NumControllerTypes];  // rig space
+        bool controllerActiveFlags[NumControllerTypes];
+        bool isTalking;
+        float bodyCapsuleRadius;
+        float bodyCapsuleHalfHeight;
+        glm::vec3 bodyCapsuleLocalOffset;
     };
 
     struct EyeParameters {
@@ -67,25 +72,6 @@ public:
         int rightEyeJointIndex = -1;
     };
 
-    struct HandAndFeetParameters {
-        bool isLeftEnabled;
-        bool isRightEnabled;
-        float bodyCapsuleRadius;
-        float bodyCapsuleHalfHeight;
-        glm::vec3 bodyCapsuleLocalOffset;
-        glm::vec3 leftPosition = glm::vec3();     // rig space
-        glm::quat leftOrientation = glm::quat();  // rig space (z forward)
-        glm::vec3 rightPosition = glm::vec3();    // rig space
-        glm::quat rightOrientation = glm::quat(); // rig space (z forward)
-
-        bool isLeftFootEnabled;
-        bool isRightFootEnabled;
-        glm::vec3 leftFootPosition = glm::vec3();     // rig space
-        glm::quat leftFootOrientation = glm::quat();  // rig space (z forward)
-        glm::vec3 rightFootPosition = glm::vec3();    // rig space
-        glm::quat rightFootOrientation = glm::quat(); // rig space (z forward)
-    };
-
     enum class CharacterControllerState {
         Ground = 0,
         Takeoff,
@@ -153,9 +139,6 @@ public:
     bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) const;
     bool getAbsoluteJointPoseInRigFrame(int jointIndex, AnimPose& returnPose) const;
 
-    // legacy
-    bool getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const;
-
     // rig space
     glm::mat4 getJointTransform(int jointIndex) const;
 
@@ -195,9 +178,8 @@ public:
     // legacy
     void clearJointStatePriorities();
 
-    void updateFromHeadParameters(const HeadParameters& params, float dt);
+    void updateFromControllerParameters(const ControllerParameters& params, float dt);
     void updateFromEyeParameters(const EyeParameters& params);
-    void updateFromHandAndFeetParameters(const HandAndFeetParameters& params, float dt);
 
     void initAnimGraph(const QUrl& url);
 
@@ -247,11 +229,18 @@ protected:
     void applyOverridePoses();
     void buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& absolutePosesOut);
 
-    void updateHeadAnimVars(const HeadParameters& params);
+    void updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headMatrix);
+    void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
+                     const AnimPose& leftHandPose, const AnimPose& rightHandPose,
+                     float bodyCapsuleRadius, float bodyCapsuleHalfHeight, const glm::vec3& bodyCapsuleLocalOffset);
+    void updateFeet(bool leftFootEnabled, bool rightFootEnabled, const AnimPose& leftFootPose, const AnimPose& rightFootPose);
 
     void updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm::quat& modelRotation, const glm::vec3& lookAt, const glm::vec3& saccade);
     void calcAnimAlpha(float speed, const std::vector<float>& referenceSpeeds, float* alphaOut) const;
 
+    glm::vec3 calculateElbowPoleVector(int handIndex, int elbowIndex, int armIndex, int hipsIndex, bool isLeft) const;
+    glm::vec3 calculateKneePoleVector(int footJointIndex, int kneeJoint, int upLegIndex, int hipsIndex, const AnimPose& targetFootPose) const;
+
     AnimPose _modelOffset;  // model to rig space
     AnimPose _geometryOffset; // geometry to model space (includes unit offset & fst offsets)
     AnimPose _invGeometryOffset;
@@ -347,13 +336,12 @@ protected:
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
 
-private:
     QMap<int, StateHandler> _stateHandlers;
     int _nextStateHandlerId { 0 };
     QMutex _stateMutex;
 
-    bool transitionHandPose(float deltaTime, float totalDuration, AnimPose& controlledHandPose, bool isLeftHand, 
-        bool isToControlled, AnimPose& returnHandPose);
+    bool transitionHandPose(float deltaTime, float totalDuration, AnimPose& controlledHandPose, bool isLeftHand,
+                            bool isToControlled, AnimPose& returnHandPose);
 
     bool _isLeftHandControlled { false };
     bool _isRightHandControlled { false };
@@ -363,6 +351,18 @@ private:
     float _rightHandRelaxTimeRemaining { 0.0f };
     AnimPose _lastLeftHandControlledPose;
     AnimPose _lastRightHandControlledPose;
+
+    glm::vec3 _prevRightFootPoleVector { Vectors::UNIT_Z };
+    bool _prevRightFootPoleVectorValid { false };
+
+    glm::vec3 _prevLeftFootPoleVector { Vectors::UNIT_Z };
+    bool _prevLeftFootPoleVectorValid { false };
+
+    glm::vec3 _prevRightHandPoleVector { -Vectors::UNIT_Z };
+    bool _prevRightHandPoleVectorValid { false };
+
+    glm::vec3 _prevLeftHandPoleVector { -Vectors::UNIT_Z };
+    bool _prevLeftHandPoleVectorValid { false };
 };
 
 #endif /* defined(__hifi__Rig__) */
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index fc54a04a5e..43af7afdef 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -48,6 +48,7 @@
 
 #include "AudioClientLogging.h"
 #include "AudioLogging.h"
+#include "AudioHelpers.h"
 
 #include "AudioClient.h"
 
@@ -1688,23 +1689,24 @@ int AudioClient::calculateNumberOfFrameSamples(int numBytes) const {
 }
 
 float AudioClient::azimuthForSource(const glm::vec3& relativePosition) {
-    // copied from AudioMixer, more or less
     glm::quat inverseOrientation = glm::inverse(_orientationGetter());
     
-    // compute sample delay for the 2 ears to create phase panning
     glm::vec3 rotatedSourcePosition = inverseOrientation * relativePosition;
     
-    // project the rotated source position vector onto x-y plane
+    // project the rotated source position vector onto the XZ plane
     rotatedSourcePosition.y = 0.0f;
 
     static const float SOURCE_DISTANCE_THRESHOLD = 1e-30f;
 
-    if (glm::length2(rotatedSourcePosition) > SOURCE_DISTANCE_THRESHOLD) {
+    float rotatedSourcePositionLength2 = glm::length2(rotatedSourcePosition);
+    if (rotatedSourcePositionLength2 > SOURCE_DISTANCE_THRESHOLD) {
         
         // produce an oriented angle about the y-axis
-        return glm::orientedAngle(glm::vec3(0.0f, 0.0f, -1.0f), glm::normalize(rotatedSourcePosition), glm::vec3(0.0f, -1.0f, 0.0f));
-    } else {
-        
+        glm::vec3 direction = rotatedSourcePosition * (1.0f / fastSqrtf(rotatedSourcePositionLength2));
+		float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
+        return (direction.x < 0.0f) ? -angle : angle;
+
+    } else {   
         // no azimuth if they are in same spot
         return 0.0f; 
     }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 4926ca0fdb..5023bd7ae5 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1509,6 +1509,7 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
             >> identity.attachmentData
             >> identity.displayName
             >> identity.sessionDisplayName
+            >> identity.isReplicated
             >> identity.avatarEntityData;
 
         // set the store identity sequence number to match the incoming identity
@@ -1531,6 +1532,11 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
         }
         maybeUpdateSessionDisplayNameFromTransport(identity.sessionDisplayName);
 
+        if (identity.isReplicated != _isReplicated) {
+            _isReplicated = identity.isReplicated;
+            identityChanged = true;
+        }
+
         if (identity.attachmentData != _attachmentData) {
             setAttachmentData(identity.attachmentData);
             identityChanged = true;
@@ -1561,7 +1567,7 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
     }
 }
 
-QByteArray AvatarData::identityByteArray() const {
+QByteArray AvatarData::identityByteArray(bool setIsReplicated) const {
     QByteArray identityData;
     QDataStream identityStream(&identityData, QIODevice::Append);
     const QUrl& urlToSend = cannonicalSkeletonModelURL(emptyURL); // depends on _skeletonModelURL
@@ -1576,6 +1582,7 @@ QByteArray AvatarData::identityByteArray() const {
             << _attachmentData
             << _displayName
             << getSessionDisplayNameForTransport() // depends on _sessionDisplayName
+            << (_isReplicated || setIsReplicated)
             << _avatarEntityData;
     });
 
@@ -1971,7 +1978,7 @@ JointData jointDataFromJsonValue(const QJsonValue& json) {
         result.rotation = quatFromJsonValue(array[0]);
         result.rotationSet = true;
         result.translation = vec3FromJsonValue(array[1]);
-        result.translationSet = false;
+        result.translationSet = true;
     }
     return result;
 }
@@ -2139,12 +2146,9 @@ void AvatarData::fromJson(const QJsonObject& json, bool useFrameSkeleton) {
             QVector<JointData> jointArray;
             QJsonArray jointArrayJson = json[JSON_AVATAR_JOINT_ARRAY].toArray();
             jointArray.reserve(jointArrayJson.size());
-            int i = 0;
             for (const auto& jointJson : jointArrayJson) {
                 auto joint = jointDataFromJsonValue(jointJson);
                 jointArray.push_back(joint);
-                setJointData(i, joint.rotation, joint.translation);
-                i++;
             }
             setRawJointData(jointArray);
         }
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index de905277d5..63bdd1112f 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -531,6 +531,7 @@ public:
         QVector<AttachmentData> attachmentData;
         QString displayName;
         QString sessionDisplayName;
+        bool isReplicated;
         AvatarEntityMap avatarEntityData;
     };
 
@@ -539,7 +540,7 @@ public:
     void processAvatarIdentity(const QByteArray& identityData, bool& identityChanged,
                                bool& displayNameChanged, bool& skeletonModelUrlChanged);
 
-    QByteArray identityByteArray() const;
+    QByteArray identityByteArray(bool setIsReplicated = false) const;
 
     const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; }
     const QString& getDisplayName() const { return _displayName; }
@@ -629,6 +630,8 @@ public:
 
     float getDensity() const { return _density; }
 
+    bool getIsReplicated() const { return _isReplicated; }
+
 signals:
     void displayNameChanged();
 
@@ -665,6 +668,10 @@ protected:
     bool hasParent() const { return !getParentID().isNull(); }
     bool hasFaceTracker() const { return _headData ? _headData->_isFaceTrackerConnected : false; }
 
+    // isReplicated will be true on downstream Avatar Mixers and their clients, but false on the upstream "master"
+    // Audio Mixer that the replicated avatar is connected to.
+    bool _isReplicated{ false };
+
     glm::vec3 _handPosition;
     virtual const QString& getSessionDisplayNameForTransport() const { return _sessionDisplayName; }
     virtual void maybeUpdateSessionDisplayNameFromTransport(const QString& sessionDisplayName) { } // No-op in AvatarMixer
diff --git a/libraries/avatars/src/ScriptAvatarData.cpp b/libraries/avatars/src/ScriptAvatarData.cpp
index 01d7f293d8..90ec7ec309 100644
--- a/libraries/avatars/src/ScriptAvatarData.cpp
+++ b/libraries/avatars/src/ScriptAvatarData.cpp
@@ -152,6 +152,15 @@ QString ScriptAvatarData::getSessionDisplayName() const {
         return QString();
     }
 }
+
+bool ScriptAvatarData::getIsReplicated() const {
+    if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
+        return sharedAvatarData->getIsReplicated();
+    } else {
+        return false;
+    }
+}
+
 //
 // IDENTIFIER PROPERTIES
 // END
diff --git a/libraries/avatars/src/ScriptAvatarData.h b/libraries/avatars/src/ScriptAvatarData.h
index d763b6e97a..1b6944e01d 100644
--- a/libraries/avatars/src/ScriptAvatarData.h
+++ b/libraries/avatars/src/ScriptAvatarData.h
@@ -45,6 +45,7 @@ class ScriptAvatarData : public QObject {
     Q_PROPERTY(QUuid sessionUUID READ getSessionUUID)
     Q_PROPERTY(QString displayName READ getDisplayName NOTIFY displayNameChanged)
     Q_PROPERTY(QString sessionDisplayName READ getSessionDisplayName)
+    Q_PROPERTY(bool isReplicated READ getIsReplicated)
 
     //
     // ATTACHMENT AND JOINT PROPERTIES
@@ -95,6 +96,7 @@ public:
     QUuid getSessionUUID() const;
     QString getDisplayName() const;
     QString getSessionDisplayName() const;
+    bool getIsReplicated() const;
 
     //
     // ATTACHMENT AND JOINT PROPERTIES
diff --git a/libraries/controllers/src/controllers/Input.cpp b/libraries/controllers/src/controllers/Input.cpp
index 6f8bd547a2..dbc9071f43 100644
--- a/libraries/controllers/src/controllers/Input.cpp
+++ b/libraries/controllers/src/controllers/Input.cpp
@@ -9,9 +9,14 @@
 #include "Input.h"
 
 namespace controller {
-    const Input Input::INVALID_INPUT = Input(0x7fffffff);
+    const Input Input::INVALID_INPUT = invalidInput();
     const uint16_t Input::INVALID_DEVICE = Input::INVALID_INPUT.device;
     const uint16_t Input::INVALID_CHANNEL = Input::INVALID_INPUT.channel;
     const uint16_t Input::INVALID_TYPE = Input::INVALID_INPUT.type;
+
+    const Input& Input::invalidInput() {
+        static const Input INVALID_INPUT = Input(0x7fffffff);
+        return INVALID_INPUT;
+    }
 }
 
diff --git a/libraries/controllers/src/controllers/Input.h b/libraries/controllers/src/controllers/Input.h
index b74ad48c6f..3ca4076de2 100644
--- a/libraries/controllers/src/controllers/Input.h
+++ b/libraries/controllers/src/controllers/Input.h
@@ -83,6 +83,8 @@ struct Input {
 
     using NamedPair = QPair<Input, QString>;
     using NamedVector = QVector<NamedPair>;
+
+    static const Input& invalidInput();
 };
 
 }
diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index 79f4325ae6..29f011fba2 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -47,8 +47,8 @@
 
 namespace controller {
     const uint16_t UserInputMapper::STANDARD_DEVICE = 0;
-    const uint16_t UserInputMapper::ACTIONS_DEVICE = Input::INVALID_DEVICE - 0x00FF;
-    const uint16_t UserInputMapper::STATE_DEVICE = Input::INVALID_DEVICE - 0x0100;
+    const uint16_t UserInputMapper::ACTIONS_DEVICE = Input::invalidInput().device - 0x00FF;
+    const uint16_t UserInputMapper::STATE_DEVICE = Input::invalidInput().device - 0x0100;
 }
 
 // Default contruct allocate the poutput size with the current hardcoded action channels
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 42746d2046..1684c06512 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -163,7 +163,6 @@ void EntityTreeRenderer::reloadEntityScripts() {
 void EntityTreeRenderer::init() {
     OctreeProcessor::init();
     EntityTreePointer entityTree = std::static_pointer_cast<EntityTree>(_tree);
-    entityTree->setFBXService(this);
 
     if (_wantScripts) {
         resetEntitiesScriptEngine();
@@ -188,7 +187,6 @@ void EntityTreeRenderer::shutdown() {
 
 void EntityTreeRenderer::setTree(OctreePointer newTree) {
     OctreeProcessor::setTree(newTree);
-    std::static_pointer_cast<EntityTree>(_tree)->setFBXService(this);
 }
 
 void EntityTreeRenderer::update() {
@@ -373,31 +371,6 @@ bool EntityTreeRenderer::applyLayeredZones() {
      return true;
 }
 
-const FBXGeometry* EntityTreeRenderer::getGeometryForEntity(EntityItemPointer entityItem) {
-    const FBXGeometry* result = NULL;
-
-    if (entityItem->getType() == EntityTypes::Model) {
-        std::shared_ptr<RenderableModelEntityItem> modelEntityItem =
-                                                        std::dynamic_pointer_cast<RenderableModelEntityItem>(entityItem);
-        assert(modelEntityItem); // we need this!!!
-        ModelPointer model = modelEntityItem->getModel(getSharedFromThis());
-        if (model && model->isLoaded()) {
-            result = &model->getFBXGeometry();
-        }
-    }
-    return result;
-}
-
-ModelPointer EntityTreeRenderer::getModelForEntityItem(EntityItemPointer entityItem) {
-    ModelPointer result = nullptr;
-    if (entityItem->getType() == EntityTypes::Model) {
-        std::shared_ptr<RenderableModelEntityItem> modelEntityItem =
-                                                        std::dynamic_pointer_cast<RenderableModelEntityItem>(entityItem);
-        result = modelEntityItem->getModel(getSharedFromThis());
-    }
-    return result;
-}
-
 void EntityTreeRenderer::processEraseMessage(ReceivedMessage& message, const SharedNodePointer& sourceNode) {
     std::static_pointer_cast<EntityTree>(_tree)->processEraseMessage(message, sourceNode);
 }
@@ -889,7 +862,12 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, bool
 
 void EntityTreeRenderer::playEntityCollisionSound(EntityItemPointer entity, const Collision& collision) {
     assert((bool)entity);
-    SharedSoundPointer collisionSound = entity->getCollisionSound();
+    auto renderable = entity->getRenderableInterface();
+    if (!renderable) { 
+        return; 
+    }
+    
+    SharedSoundPointer collisionSound = renderable->getCollisionSound();
     if (!collisionSound) {
         return;
     }
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h
index 5dcbd1aeb9..f4909a2036 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.h
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.h
@@ -39,7 +39,7 @@ using ModelWeakPointer = std::weak_ptr<Model>;
 using CalculateEntityLoadingPriority = std::function<float(const EntityItem& item)>;
 
 // Generic client side Octree renderer class.
-class EntityTreeRenderer : public OctreeProcessor, public EntityItemFBXService, public Dependency {
+class EntityTreeRenderer : public OctreeProcessor, public Dependency {
     Q_OBJECT
 public:
     EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
@@ -68,9 +68,6 @@ public:
 
     virtual void init() override;
 
-    virtual const FBXGeometry* getGeometryForEntity(EntityItemPointer entityItem) override;
-    virtual ModelPointer getModelForEntityItem(EntityItemPointer entityItem) override;
-
     /// clears the tree
     virtual void clear() override;
 
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 244a850d67..c848b10f6a 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -14,6 +14,7 @@
 
 #include <render/Scene.h>
 #include <EntityItem.h>
+#include <Sound.h>
 #include "AbstractViewStateInterface.h"
 #include "EntitiesRendererLogging.h"
 
@@ -40,7 +41,11 @@ public:
     virtual void render(RenderArgs* args) {};
     virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) = 0;
     virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) = 0;
+    const SharedSoundPointer& getCollisionSound() { return _collisionSound; }
+    void setCollisionSound(const SharedSoundPointer& sound) { _collisionSound = sound; }
     virtual RenderableEntityInterface* getRenderableInterface() { return nullptr; }
+private:
+    SharedSoundPointer _collisionSound;
 };
 
 class RenderableEntityItemProxy {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index f343fdb155..0547c60364 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -69,11 +69,9 @@ void RenderableModelEntityItem::setModelURL(const QString& url) {
 
 void RenderableModelEntityItem::loader() {
     _needsModelReload = true;
-    auto renderer = DependencyManager::get<EntityTreeRenderer>();
-    assert(renderer);
     {
         PerformanceTimer perfTimer("getModel");
-        getModel(renderer);
+        getModel();
     }
 }
 
@@ -390,8 +388,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
         if (!_model || _needsModelReload) {
             // TODO: this getModel() appears to be about 3% of model render time. We should optimize
             PerformanceTimer perfTimer("getModel");
-            auto renderer = qSharedPointerCast<EntityTreeRenderer>(args->_renderData);
-            getModel(renderer);
+            getModel();
 
             // Remap textures immediately after loading to avoid flicker
             remapTextures();
@@ -483,7 +480,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
         auto& currentURL = getParsedModelURL();
         if (currentURL != _model->getURL()) {
             // Defer setting the url to the render thread
-            getModel(_myRenderer);
+            getModel();
         }
     }
 }
@@ -492,16 +489,11 @@ ModelPointer RenderableModelEntityItem::getModelNotSafe() {
     return _model;
 }
 
-ModelPointer RenderableModelEntityItem::getModel(QSharedPointer<EntityTreeRenderer> renderer) {
-    if (!renderer) {
-        return nullptr;
-    }
-
+ModelPointer RenderableModelEntityItem::getModel() {
     // make sure our renderer is setup
     if (!_myRenderer) {
-        _myRenderer = renderer;
+        _myRenderer = DependencyManager::get<EntityTreeRenderer>();
     }
-    assert(_myRenderer == renderer); // you should only ever render on one renderer
 
     if (!_myRenderer || QThread::currentThread() != _myRenderer->thread()) {
         return _model;
@@ -513,7 +505,7 @@ ModelPointer RenderableModelEntityItem::getModel(QSharedPointer<EntityTreeRender
     if (!getModelURL().isEmpty()) {
         // If we don't have a model, allocate one *immediately*
         if (!_model) {
-            _model = _myRenderer->allocateModel(getModelURL(), renderer->getEntityLoadingPriority(*this), this);
+            _model = _myRenderer->allocateModel(getModelURL(), _myRenderer->getEntityLoadingPriority(*this), this);
             _needsInitialSimulation = true;
         // If we need to change URLs, update it *after rendering* (to avoid access violations)
         } else if (QUrl(getModelURL()) != _model->getURL()) {
@@ -587,6 +579,17 @@ EntityItemProperties RenderableModelEntityItem::getProperties(EntityPropertyFlag
         properties.setRenderInfoHasTransparent(_model->getRenderInfoHasTransparent());
     }
 
+
+    if (_model && _model->isLoaded()) {
+        // TODO: improve naturalDimensions in the future,
+        //       for now we've added this hack for setting natural dimensions of models
+        Extents meshExtents = _model->getFBXGeometry().getUnscaledMeshExtents();
+        properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
+        properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
+    }
+
+
+
     return properties;
 }
 
@@ -1255,3 +1258,27 @@ QStringList RenderableModelEntityItem::getJointNames() const {
     }
     return result;
 }
+
+void RenderableModelEntityItem::mapJoints(const QStringList& modelJointNames) {
+    // if we don't have animation, or we're already joint mapped then bail early
+    if (!hasAnimation() || jointsMapped()) {
+        return;
+    }
+
+    if (!_animation || _animation->getURL().toString() != getAnimationURL()) {
+        _animation = DependencyManager::get<AnimationCache>()->getAnimation(getAnimationURL());
+    }
+
+    if (_animation && _animation->isLoaded()) {
+        QStringList animationJointNames = _animation->getJointNames();
+
+        if (modelJointNames.size() > 0 && animationJointNames.size() > 0) {
+            _jointMapping.resize(modelJointNames.size());
+            for (int i = 0; i < modelJointNames.size(); i++) {
+                _jointMapping[i] = animationJointNames.indexOf(modelJointNames[i]);
+            }
+            _jointMappingCompleted = true;
+            _jointMappingURL = _animationProperties.getURL();
+        }
+    }
+}
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 2bbb51b3f0..2d240c01a6 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -16,6 +16,7 @@
 #include <QStringList>
 
 #include <ModelEntityItem.h>
+#include <AnimationCache.h>
 
 class Model;
 class EntityTreeRenderer;
@@ -53,7 +54,7 @@ public:
                         bool& keepSearching, OctreeElementPointer& element, float& distance,
                         BoxFace& face, glm::vec3& surfaceNormal,
                         void** intersectedObject, bool precisionPicking) const override;
-    ModelPointer getModel(QSharedPointer<EntityTreeRenderer> renderer);
+    ModelPointer getModel();
     ModelPointer getModelNotSafe();
 
     virtual bool needsToCallUpdate() const override;
@@ -106,6 +107,15 @@ public:
     // Transparency is handled in ModelMeshPartPayload
     bool isTransparent() override { return false; }
 
+    void mapJoints(const QStringList& modelJointNames);
+    bool jointsMapped() const {
+        return _jointMappingURL == getAnimationURL() && _jointMappingCompleted;
+    }
+
+    AnimationPointer getAnimation() const {
+        return _animation;
+    }
+
 private:
     QVariantMap parseTexturesToMap(QString textures);
     void remapTextures();
@@ -131,6 +141,12 @@ private:
     bool _needsJointSimulation { false };
     bool _showCollisionGeometry { false };
     const void* _collisionMeshKey { nullptr };
+
+    // used on client side
+    bool _jointMappingCompleted { false };
+    QVector<int> _jointMapping; // domain is index into model-joints, range is index into animation-joints
+    QString _jointMappingURL;
+    AnimationPointer _animation;
 };
 
 #endif // hifi_RenderableModelEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 6cda472d96..88a5d2b873 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -9,11 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+
+#include "RenderablePolyVoxEntityItem.h"
+
 #include <math.h>
 #include <QObject>
 #include <QByteArray>
 #include <QtConcurrent/QtConcurrentRun>
 #include <glm/gtx/transform.hpp>
+#include <model-networking/SimpleMeshProxy.h>
 #include "ModelScriptingInterface.h"
 
 #if defined(__GNUC__) && !defined(__clang__)
@@ -52,7 +56,6 @@
 #include "EntityTreeRenderer.h"
 #include "polyvox_vert.h"
 #include "polyvox_frag.h"
-#include "RenderablePolyVoxEntityItem.h"
 #include "EntityEditPacketSender.h"
 #include "PhysicalEntitySimulation.h"
 
@@ -1626,6 +1629,7 @@ void RenderablePolyVoxEntityItem::locationChanged(bool tellPhysics) {
     scene->enqueueTransaction(transaction);
 }
 
+
 bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
     if (!updateDependents()) {
         return false;
@@ -1645,7 +1649,7 @@ bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
         } else {
             success = true;
             // the mesh will be in voxel-space.  transform it into object-space
-            meshProxy = new MeshProxy(
+            meshProxy = new SimpleMeshProxy(
                 _mesh->map([=](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
                            [=](glm::vec3 normal){ return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
                            [&](uint32_t index){ return index; }));
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index 174d6338d3..45625ada6d 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -12,17 +12,19 @@
 #ifndef hifi_RenderablePolyVoxEntityItem_h
 #define hifi_RenderablePolyVoxEntityItem_h
 
-#include <QSemaphore>
 #include <atomic>
 
+#include <QSemaphore>
+
 #include <PolyVoxCore/SimpleVolume.h>
 #include <PolyVoxCore/Raycast.h>
 
+#include <gpu/Context.h>
+#include <model/Forward.h>
 #include <TextureCache.h>
+#include <PolyVoxEntityItem.h>
 
-#include "PolyVoxEntityItem.h"
 #include "RenderableEntityItem.h"
-#include "gpu/Context.h"
 
 class PolyVoxPayload {
 public:
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index ddb5fbaf73..19341ec3e2 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,9 +1,3 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-link_hifi_libraries(avatars shared audio octree model model-networking fbx networking animation)
-include_hifi_library_headers(networking)
-include_hifi_library_headers(gpu)
-
-target_bullet()
-
-include_hifi_library_headers(render)
+link_hifi_libraries(shared networking octree avatars)
diff --git a/libraries/entities/src/AnimationPropertyGroup.cpp b/libraries/entities/src/AnimationPropertyGroup.cpp
index f6d08ad8b9..848d4352a7 100644
--- a/libraries/entities/src/AnimationPropertyGroup.cpp
+++ b/libraries/entities/src/AnimationPropertyGroup.cpp
@@ -9,12 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimationPropertyGroup.h"
+
 #include <QJsonDocument>
 #include <OctreePacketData.h>
 
-#include <AnimationLoop.h>
 
-#include "AnimationPropertyGroup.h"
 #include "EntityItemProperties.h"
 #include "EntityItemPropertiesMacros.h"
 
diff --git a/libraries/entities/src/AnimationPropertyGroup.h b/libraries/entities/src/AnimationPropertyGroup.h
index c6d386d2ef..c0086b41b3 100644
--- a/libraries/entities/src/AnimationPropertyGroup.h
+++ b/libraries/entities/src/AnimationPropertyGroup.h
@@ -19,7 +19,7 @@
 
 #include <QtScript/QScriptEngine>
 
-#include "AnimationLoop.h"
+#include <shared/types/AnimationLoop.h> // for Animation, AnimationCache, and AnimationPointer classes
 #include "EntityItemPropertiesMacros.h"
 #include "PropertyGroup.h"
 
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 17de15e32b..23ce097cc2 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -23,8 +23,8 @@
 #include <PhysicsHelpers.h>
 #include <RegisteredMetaTypes.h>
 #include <SharedUtil.h> // usecTimestampNow()
-#include <SoundCache.h>
 #include <LogHandler.h>
+#include <Extents.h>
 
 #include "EntityScriptingInterface.h"
 #include "EntitiesLogging.h"
@@ -988,21 +988,6 @@ void EntityItem::setCollisionSoundURL(const QString& value) {
     }
 }
 
-SharedSoundPointer EntityItem::getCollisionSound() {
-    SharedSoundPointer result;
-    withReadLock([&] {
-        result = _collisionSound;
-    });
-
-    if (!result) {
-        result = DependencyManager::get<SoundCache>()->getSound(_collisionSoundURL);
-        withWriteLock([&] {
-            _collisionSound = result;
-        });
-    }
-    return result;
-}
-
 void EntityItem::simulate(const quint64& now) {
     if (getLastSimulated() == 0) {
         setLastSimulated(now);
@@ -2650,12 +2635,6 @@ QString EntityItem::getCollisionSoundURL() const {
     return result;
 }
 
-void EntityItem::setCollisionSound(SharedSoundPointer sound) { 
-    withWriteLock([&] {
-        _collisionSound = sound;
-    });
-}
-
 glm::vec3 EntityItem::getRegistrationPoint() const { 
     glm::vec3 result;
     withReadLock([&] {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 0318c72991..92c83651aa 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -19,14 +19,13 @@
 
 #include <QtGui/QWindow>
 
-#include <AnimationCache.h> // for Animation, AnimationCache, and AnimationPointer classes
+#include <shared/types/AnimationLoop.h> // for Animation, AnimationCache, and AnimationPointer classes
 #include <Octree.h> // for EncodeBitstreamParams class
 #include <OctreeElement.h> // for OctreeElement::AppendState
 #include <OctreePacketData.h>
 #include <PhysicsCollisionGroups.h>
 #include <ShapeInfo.h>
 #include <Transform.h>
-#include <Sound.h>
 #include <SpatiallyNestable.h>
 #include <Interpolate.h>
 
@@ -260,9 +259,6 @@ public:
     QString getCollisionSoundURL() const;
     void setCollisionSoundURL(const QString& value);
 
-    SharedSoundPointer getCollisionSound();
-    void setCollisionSound(SharedSoundPointer sound);
-
     glm::vec3 getRegistrationPoint() const; /// registration point as ratio of entity
 
     /// registration point as ratio of entity
@@ -526,7 +522,6 @@ protected:
     quint64 _loadedScriptTimestamp { ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP + 1 };
 
     QString _collisionSoundURL;
-    SharedSoundPointer _collisionSound;
     glm::vec3 _registrationPoint;
     float _angularDamping;
     bool _visible;
diff --git a/libraries/entities/src/EntityItemID.cpp b/libraries/entities/src/EntityItemID.cpp
index 5f07019db4..3b4ca1cea0 100644
--- a/libraries/entities/src/EntityItemID.cpp
+++ b/libraries/entities/src/EntityItemID.cpp
@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "EntityItemID.h"
 #include <QtCore/QObject>
 #include <QDebug>
 
@@ -17,7 +18,6 @@
 #include <UUID.h>
 
 #include "RegisteredMetaTypes.h"
-#include "EntityItemID.h"
 
 int entityItemIDTypeID = qRegisterMetaType<EntityItemID>();
 
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 1ed020e592..a207902789 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -17,6 +17,7 @@
 #include <ByteCountCoding.h>
 #include <GLMHelpers.h>
 #include <RegisteredMetaTypes.h>
+#include <Extents.h>
 
 #include "EntitiesLogging.h"
 #include "EntityItem.h"
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 590298e102..b526ac663c 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -15,6 +15,7 @@
 #include <stdint.h>
 
 #include <glm/glm.hpp>
+#include <glm/gtx/component_wise.hpp>
 
 #include <QtScript/QScriptEngine>
 #include <QtCore/QObject>
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 90dc6893b4..7351d49dff 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -21,7 +21,6 @@
 #include <VariantMapToScriptValue.h>
 #include <SharedUtil.h>
 #include <SpatialParentFinder.h>
-#include <model-networking/MeshProxy.h>
 
 #include "EntitiesLogging.h"
 #include "EntityDynamicFactoryInterface.h"
@@ -298,18 +297,6 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
                 }
 
                 results = entity->getProperties(desiredProperties);
-
-                // TODO: improve naturalDimensions in the future,
-                //       for now we've added this hack for setting natural dimensions of models
-                if (entity->getType() == EntityTypes::Model) {
-                    const FBXGeometry* geometry = _entityTree->getGeometryForEntity(entity);
-                    if (geometry) {
-                        Extents meshExtents = geometry->getUnscaledMeshExtents();
-                        results.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
-                        results.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
-                    }
-                }
-
             }
         });
     }
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 11694c4cea..4773f45af7 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -9,11 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <PerfStat.h>
-#include <QDateTime>
+#include "EntityTree.h"
+#include <QtCore/QDateTime>
+#include <QtCore/QQueue>
+
 #include <QtScript/QScriptEngine>
 
-#include "EntityTree.h"
+#include <PerfStat.h>
+#include <Extents.h>
+
 #include "EntitySimulation.h"
 #include "VariantMapToScriptValue.h"
 
@@ -55,9 +59,7 @@ public:
 
 
 EntityTree::EntityTree(bool shouldReaverage) :
-    Octree(shouldReaverage),
-    _fbxService(NULL),
-    _simulation(NULL)
+    Octree(shouldReaverage)
 {
     resetClientEditStats();
 }
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 8e3c9f5412..24e6c364b1 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -41,13 +41,6 @@ public:
     virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) = 0;
 };
 
-class EntityItemFBXService {
-public:
-    virtual const FBXGeometry* getGeometryForEntity(EntityItemPointer entityItem) = 0;
-    virtual ModelPointer getModelForEntityItem(EntityItemPointer entityItem) = 0;
-};
-
-
 class SendEntitiesOperationArgs {
 public:
     glm::vec3 root;
@@ -189,15 +182,6 @@ public:
     int processEraseMessage(ReceivedMessage& message, const SharedNodePointer& sourceNode);
     int processEraseMessageDetails(const QByteArray& buffer, const SharedNodePointer& sourceNode);
 
-    EntityItemFBXService* getFBXService() const { return _fbxService; }
-    void setFBXService(EntityItemFBXService* service) { _fbxService = service; }
-    const FBXGeometry* getGeometryForEntity(EntityItemPointer entityItem) {
-        return _fbxService ? _fbxService->getGeometryForEntity(entityItem) : NULL;
-    }
-    ModelPointer getModelForEntityItem(EntityItemPointer entityItem) {
-        return _fbxService ? _fbxService->getModelForEntityItem(entityItem) : NULL;
-    }
-
     EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID)  /*const*/;
     void setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element);
     void debugDumpMap();
@@ -325,8 +309,6 @@ protected:
         _deletedEntityItemIDs << id;
     }
 
-    EntityItemFBXService* _fbxService;
-
     mutable QReadWriteLock _entityToElementLock;
     QHash<EntityItemID, EntityTreeElementPointer> _entityToElementMap;
 
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 0dc42717f5..cce7ee006f 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -9,17 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "EntityTreeElement.h"
+
 #include <glm/gtx/transform.hpp>
 
-#include <FBXReader.h>
 #include <GeometryUtil.h>
 #include <OctreeUtils.h>
+#include <Extents.h>
 
 #include "EntitiesLogging.h"
 #include "EntityNodeData.h"
 #include "EntityItemProperties.h"
 #include "EntityTree.h"
-#include "EntityTreeElement.h"
 #include "EntityTypes.h"
 
 EntityTreeElement::EntityTreeElement(unsigned char* octalCode) : OctreeElement() {
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
index 1011094266..f0d059af67 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.cpp
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -9,12 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "KeyLightPropertyGroup.h"
+
 #include <QJsonDocument>
 #include <OctreePacketData.h>
 
-#include <AnimationLoop.h>
-
-#include "KeyLightPropertyGroup.h"
 #include "EntityItemProperties.h"
 #include "EntityItemPropertiesMacros.h"
 
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 89213459fa..b5e759d2d8 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -37,7 +37,6 @@ ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID) : EntityItem(
     _animationLoop.setResetOnRunning(false);
 
     _type = EntityTypes::Model;
-    _jointMappingCompleted = false;
     _lastKnownCurrentFrame = -1;
     _color[0] = _color[1] = _color[2] = 0;
 }
@@ -204,30 +203,6 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 }
 
 
-void ModelEntityItem::mapJoints(const QStringList& modelJointNames) {
-    // if we don't have animation, or we're already joint mapped then bail early
-    if (!hasAnimation() || jointsMapped()) {
-        return;
-    }
-
-    if (!_animation || _animation->getURL().toString() != getAnimationURL()) {
-        _animation = DependencyManager::get<AnimationCache>()->getAnimation(getAnimationURL());
-    }
-
-    if (_animation && _animation->isLoaded()) {
-        QStringList animationJointNames = _animation->getJointNames();
-
-        if (modelJointNames.size() > 0 && animationJointNames.size() > 0) {
-            _jointMapping.resize(modelJointNames.size());
-            for (int i = 0; i < modelJointNames.size(); i++) {
-                _jointMapping[i] = animationJointNames.indexOf(modelJointNames[i]);
-            }
-            _jointMappingCompleted = true;
-            _jointMappingURL = _animationProperties.getURL();
-        }
-    }
-}
-
 bool ModelEntityItem::isAnimatingSomething() const {
     return getAnimationIsPlaying() &&
             getAnimationFPS() != 0.0f &&
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 5076a43892..0c6132e211 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -12,8 +12,6 @@
 #ifndef hifi_ModelEntityItem_h
 #define hifi_ModelEntityItem_h
 
-#include <AnimationLoop.h>
-
 #include "EntityItem.h"
 #include "AnimationPropertyGroup.h"
 
@@ -103,10 +101,7 @@ public:
     void setAnimationLastFrame(float lastFrame) { _animationLoop.setLastFrame(lastFrame); }
     float getAnimationLastFrame() const { return _animationLoop.getLastFrame(); }
 
-    void mapJoints(const QStringList& modelJointNames);
-    bool jointsMapped() const { return _jointMappingURL == getAnimationURL() && _jointMappingCompleted; }
 
-    AnimationPointer getAnimation() const { return _animation; }
     bool getAnimationIsPlaying() const { return _animationLoop.getRunning(); }
     float getAnimationCurrentFrame() const { return _animationLoop.getCurrentFrame(); }
     float getAnimationFPS() const { return _animationLoop.getFPS(); }
@@ -158,7 +153,6 @@ protected:
     QUrl _parsedModelURL;
     QString _compoundShapeURL;
 
-    AnimationPointer _animation;
     AnimationPropertyGroup _animationProperties;
     AnimationLoop _animationLoop;
 
@@ -166,11 +160,6 @@ protected:
     QString _textures;
 
     ShapeType _shapeType = SHAPE_TYPE_NONE;
-
-    // used on client side
-    bool _jointMappingCompleted;
-    QVector<int> _jointMapping; // domain is index into model-joints, range is index into animation-joints
-    QString _jointMappingURL;
 };
 
 #endif // hifi_ModelEntityItem_h
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
index 791130ef6e..11e67811b6 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
@@ -114,7 +114,9 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
     (&::gpu::gl::GLBackend::do_getQuery),
 
     (&::gpu::gl::GLBackend::do_resetStages),
-
+    
+    (&::gpu::gl::GLBackend::do_disableContextViewCorrection),
+    (&::gpu::gl::GLBackend::do_restoreContextViewCorrection),
     (&::gpu::gl::GLBackend::do_disableContextStereo),
     (&::gpu::gl::GLBackend::do_restoreContextStereo),
 
@@ -178,6 +180,11 @@ void GLBackend::init() {
             int swapInterval = wglGetSwapIntervalEXT();
             qCDebug(gpugllogging, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
         }*/
+#endif
+#if THREADED_TEXTURE_BUFFERING
+        // This has to happen on the main thread in order to give the thread 
+        // pool a reasonable parent object
+        GLVariableAllocationSupport::TransferJob::startBufferingThread();
 #endif
     });
 }
@@ -369,6 +376,13 @@ void GLBackend::do_resetStages(const Batch& batch, size_t paramOffset) {
     resetStages();
 }
 
+void GLBackend::do_disableContextViewCorrection(const Batch& batch, size_t paramOffset) {
+    _transform._viewCorrectionEnabled = false;
+}
+
+void GLBackend::do_restoreContextViewCorrection(const Batch& batch, size_t paramOffset) {
+    _transform._viewCorrectionEnabled = true;
+}
 
 void GLBackend::do_disableContextStereo(const Batch& batch, size_t paramOffset) {
 
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackend.h b/libraries/gpu-gl/src/gpu/gl/GLBackend.h
index 96217555e1..88aecda617 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackend.h
@@ -143,6 +143,10 @@ public:
     // Reset stages
     virtual void do_resetStages(const Batch& batch, size_t paramOffset) final;
 
+    
+    virtual void do_disableContextViewCorrection(const Batch& batch, size_t paramOffset) final;
+    virtual void do_restoreContextViewCorrection(const Batch& batch, size_t paramOffset) final;
+
     virtual void do_disableContextStereo(const Batch& batch, size_t paramOffset) final;
     virtual void do_restoreContextStereo(const Batch& batch, size_t paramOffset) final;
 
@@ -333,6 +337,8 @@ protected:
         bool _skybox { false };
         Transform _view;
         CameraCorrection _correction;
+        bool _viewCorrectionEnabled{ true };
+
 
         Mat4 _projection;
         Vec4i _viewport { 0, 0, 1, 1 };
@@ -400,6 +406,7 @@ protected:
         bool _invalidProgram { false };
 
         BufferView _cameraCorrectionBuffer { gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(CameraCorrection), nullptr )) };
+        BufferView _cameraCorrectionBufferIdentity { gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(CameraCorrection), nullptr )) };
 
         State::Data _stateCache{ State::DEFAULT };
         State::Signature _stateSignatureCache { 0 };
@@ -409,6 +416,8 @@ protected:
 
         PipelineStageState() {
             _cameraCorrectionBuffer.edit<CameraCorrection>() = CameraCorrection();
+            _cameraCorrectionBufferIdentity.edit<CameraCorrection>() = CameraCorrection();
+            _cameraCorrectionBufferIdentity._buffer->flush();
         }
     } _pipeline;
 
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
index 2d71e8ed78..7ef64343ea 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
@@ -77,8 +77,14 @@ void GLBackend::do_setPipeline(const Batch& batch, size_t paramOffset) {
     if (_pipeline._invalidProgram) {
         glUseProgram(_pipeline._program);
         if (_pipeline._cameraCorrectionLocation != -1) {
-            auto cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBuffer._buffer);
+            gl::GLBuffer* cameraCorrectionBuffer = nullptr;
+            if (_transform._viewCorrectionEnabled) {
+                cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBuffer._buffer);
+            } else {
+                cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBufferIdentity._buffer);
+            }
             glBindBufferRange(GL_UNIFORM_BUFFER, _pipeline._cameraCorrectionLocation, cameraCorrectionBuffer->_id, 0, sizeof(CameraCorrection));
+
         }
         (void) CHECK_GL_ERROR();
         _pipeline._invalidProgram = false;
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
index 01f055e0d9..f286a5cca9 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
@@ -102,7 +102,7 @@ void GLBackend::TransformStageState::preUpdate(size_t commandIndex, const Stereo
 
     if (_invalidView) {
         // Apply the correction
-        if (_viewIsCamera && _correction.correction != glm::mat4()) {
+        if (_viewIsCamera && (_viewCorrectionEnabled && _correction.correction != glm::mat4())) {
             // FIXME should I switch to using the camera correction buffer in Transform.slf and leave this out?
             Transform result;
             _view.mult(result, _view, _correction.correction);
diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
index 4161242a24..7758ddaf49 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
@@ -461,11 +461,6 @@ void GLVariableAllocationSupport::updateMemoryPressure() {
 
     if (newState != _memoryPressureState) {
         _memoryPressureState = newState;
-#if THREADED_TEXTURE_BUFFERING
-        if (MemoryPressureState::Transfer == _memoryPressureState) {
-            TransferJob::startBufferingThread();
-        }
-#endif
         // Clear the existing queue
         _transferQueue = WorkQueue();
         _promoteQueue = WorkQueue();
diff --git a/libraries/gpu/src/gpu/Batch.cpp b/libraries/gpu/src/gpu/Batch.cpp
index 15c0dfce49..c432e19368 100644
--- a/libraries/gpu/src/gpu/Batch.cpp
+++ b/libraries/gpu/src/gpu/Batch.cpp
@@ -390,6 +390,13 @@ void Batch::resetStages() {
     ADD_COMMAND(resetStages);
 }
 
+void Batch::disableContextViewCorrection() {
+    ADD_COMMAND(disableContextViewCorrection);
+}
+
+void Batch::restoreContextViewCorrection() {
+    ADD_COMMAND(restoreContextViewCorrection);
+}
 
 void Batch::disableContextStereo() {
     ADD_COMMAND(disableContextStereo);
diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h
index 27c9402131..77d22258b2 100644
--- a/libraries/gpu/src/gpu/Batch.h
+++ b/libraries/gpu/src/gpu/Batch.h
@@ -217,6 +217,9 @@ public:
     // Reset the stage caches and states
     void resetStages();
 
+    void disableContextViewCorrection();
+    void restoreContextViewCorrection();
+
     void disableContextStereo();
     void restoreContextStereo();
 
@@ -304,6 +307,9 @@ public:
 
         COMMAND_resetStages,
 
+        COMMAND_disableContextViewCorrection,
+        COMMAND_restoreContextViewCorrection,
+
         COMMAND_disableContextStereo,
         COMMAND_restoreContextStereo,
 
diff --git a/libraries/model-networking/src/model-networking/MeshFace.cpp b/libraries/model-networking/src/model-networking/MeshFace.cpp
deleted file mode 100644
index 8092d36aa3..0000000000
--- a/libraries/model-networking/src/model-networking/MeshFace.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  MeshFace.cpp
-//  libraries/model/src/model/
-//
-//  Created by Seth Alves on 2017-3-23
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <RegisteredMetaTypes.h>
-
-#include "MeshFace.h"
-
-
-QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace) {
-    QScriptValue obj = engine->newObject();
-    obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
-    return obj;
-}
-
-void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult) {
-    qVectorIntFromScriptValue(object.property("vertices"), meshFaceResult.vertexIndices);
-}
-
-QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector) {
-    QScriptValue array = engine->newArray();
-    for (int i = 0; i < vector.size(); i++) {
-        array.setProperty(i, meshFaceToScriptValue(engine, vector.at(i)));
-    }
-    return array;
-}
-
-void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result) {
-    int length = array.property("length").toInteger();
-    result.clear();
-
-    for (int i = 0; i < length; i++) {
-        MeshFace meshFace = MeshFace();
-        meshFaceFromScriptValue(array.property(i), meshFace);
-        result << meshFace;
-    }
-}
diff --git a/libraries/model-networking/src/model-networking/MeshFace.h b/libraries/model-networking/src/model-networking/MeshFace.h
deleted file mode 100644
index 3b81b372c3..0000000000
--- a/libraries/model-networking/src/model-networking/MeshFace.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  MeshFace.h
-//  libraries/model/src/model/
-//
-//  Created by Seth Alves on 2017-3-23
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_MeshFace_h
-#define hifi_MeshFace_h
-
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-#include <QtScript/QScriptValue>
-
-#include <model/Geometry.h>
-
-using MeshPointer = std::shared_ptr<model::Mesh>;
-
-class MeshFace {
-
-public:
-    MeshFace() {}
-    ~MeshFace() {}
-
-    QVector<uint32_t> vertexIndices;
-    // TODO -- material...
-};
-
-Q_DECLARE_METATYPE(MeshFace)
-Q_DECLARE_METATYPE(QVector<MeshFace>)
-
-QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace);
-void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult);
-QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector);
-void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result);
-
-
-
-#endif // hifi_MeshFace_h
diff --git a/libraries/model-networking/src/model-networking/MeshProxy.cpp b/libraries/model-networking/src/model-networking/MeshProxy.cpp
deleted file mode 100644
index 1b6fa43c82..0000000000
--- a/libraries/model-networking/src/model-networking/MeshProxy.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  MeshProxy.cpp
-//  libraries/model/src/model/
-//
-//  Created by Seth Alves on 2017-3-22.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "MeshProxy.h"
-
-
-QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in) {
-    return engine->newQObject(in, QScriptEngine::QtOwnership,
-                              QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
-}
-
-void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out) {
-    out = qobject_cast<MeshProxy*>(value.toQObject());
-}
-
-QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in) {
-    // QScriptValueList result;
-    QScriptValue result = engine->newArray();
-    int i = 0;
-    foreach (MeshProxy* const meshProxy, in) {
-        result.setProperty(i++, meshToScriptValue(engine, meshProxy));
-    }
-    return result;
-}
-
-void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out) {
-    QScriptValueIterator itr(value);
-
-    qDebug() << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32();
-
-    while(itr.hasNext()) {
-        itr.next();
-        MeshProxy* meshProxy = qscriptvalue_cast<MeshProxyList::value_type>(itr.value());
-        if (meshProxy) {
-            out.append(meshProxy);
-        } else {
-            qDebug() << "null meshProxy";
-        }
-    }
-}
diff --git a/libraries/model-networking/src/model-networking/MeshProxy.h b/libraries/model-networking/src/model-networking/MeshProxy.h
deleted file mode 100644
index c5b25b7895..0000000000
--- a/libraries/model-networking/src/model-networking/MeshProxy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//  MeshProxy.h
-//  libraries/model/src/model/
-//
-//  Created by Seth Alves on 2017-1-27.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_MeshProxy_h
-#define hifi_MeshProxy_h
-
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-#include <QtScript/QScriptValue>
-
-#include <model/Geometry.h>
-
-using MeshPointer = std::shared_ptr<model::Mesh>;
-
-class MeshProxy : public QObject {
-    Q_OBJECT
-
-public:
-    MeshProxy(MeshPointer mesh) : _mesh(mesh) {}
-    ~MeshProxy() {}
-
-    MeshPointer getMeshPointer() const { return _mesh; }
-
-    Q_INVOKABLE int getNumVertices() const { return (int)_mesh->getNumVertices(); }
-    Q_INVOKABLE glm::vec3 getPos3(int index) const { return _mesh->getPos3(index); }
-
-
-protected:
-    MeshPointer _mesh;
-};
-
-Q_DECLARE_METATYPE(MeshProxy*);
-
-class MeshProxyList : public QList<MeshProxy*> {}; // typedef and using fight with the Qt macros/templates, do this instead
-Q_DECLARE_METATYPE(MeshProxyList);
-
-
-QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in);
-void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out);
-
-QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in);
-void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out);
-
-#endif // hifi_MeshProxy_h
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp b/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
new file mode 100644
index 0000000000..b44ea1ff56
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
@@ -0,0 +1,27 @@
+//
+//  SimpleMeshProxy.cpp
+//  libraries/model-networking/src/model-networking/
+//
+//  Created by Seth Alves on 2017-3-22.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "SimpleMeshProxy.h"
+
+#include <model/Geometry.h>
+
+MeshPointer SimpleMeshProxy::getMeshPointer() const {
+    return _mesh;
+}
+
+int SimpleMeshProxy::getNumVertices() const {
+    return (int)_mesh->getNumVertices();
+}
+
+glm::vec3 SimpleMeshProxy::getPos3(int index) const {
+    return _mesh->getPos3(index);
+}
+
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
new file mode 100644
index 0000000000..24c3fca27e
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
@@ -0,0 +1,36 @@
+//
+//  SimpleMeshProxy.h
+//  libraries/model-networking/src/model-networking/
+//
+//  Created by Seth Alves on 2017-1-27.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_SimpleMeshProxy_h
+#define hifi_SimpleMeshProxy_h
+
+#include <QScriptEngine>
+#include <QScriptValueIterator>
+#include <QtScript/QScriptValue>
+
+#include <RegisteredMetaTypes.h>
+
+class SimpleMeshProxy : public MeshProxy {
+public:
+    SimpleMeshProxy(const MeshPointer& mesh) : _mesh(mesh) { }
+
+    MeshPointer getMeshPointer() const override;
+
+    int getNumVertices() const override;
+
+    glm::vec3 getPos3(int index) const override;
+
+
+protected:
+    const MeshPointer _mesh;
+};
+
+#endif // hifi_SimpleMeshProxy_h
diff --git a/libraries/model/src/model/Forward.h b/libraries/model/src/model/Forward.h
new file mode 100644
index 0000000000..90f55fa64f
--- /dev/null
+++ b/libraries/model/src/model/Forward.h
@@ -0,0 +1,19 @@
+//
+//  Forward.h
+//  libraries/model/src/model
+//
+//  Created by Bradley Austin Davis on 2017/06/21
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_model_Forward_h
+#define hifi_model_Forward_h
+
+namespace model {
+    class Mesh;
+    using MeshPointer = std::shared_ptr<Mesh>;
+}
+
+#endif
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index 3faa9981dc..e97660da4c 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -31,7 +31,7 @@
 
 MessageID AssetClient::_currentID = 0;
 
-AssetClient::AssetClient() {
+AssetClient::AssetClient(const QString& cacheDir) : _cacheDir(cacheDir) {
     setCustomDeleter([](Dependency* dependency){
         static_cast<AssetClient*>(dependency)->deleteLater();
     });
@@ -55,14 +55,15 @@ void AssetClient::init() {
     // Setup disk cache if not already
     auto& networkAccessManager = NetworkAccessManager::getInstance();
     if (!networkAccessManager.cache()) {
-        QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
-        cachePath = !cachePath.isEmpty() ? cachePath : "interfaceCache";
-
+        if (_cacheDir.isEmpty()) {
+            QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+            _cacheDir = !cachePath.isEmpty() ? cachePath : "interfaceCache";
+        }
         QNetworkDiskCache* cache = new QNetworkDiskCache();
         cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE);
-        cache->setCacheDirectory(cachePath);
+        cache->setCacheDirectory(_cacheDir);
         networkAccessManager.setCache(cache);
-        qInfo() << "ResourceManager disk cache setup at" << cachePath
+        qInfo() << "ResourceManager disk cache setup at" << _cacheDir
                  << "(size:" << MAXIMUM_CACHE_SIZE / BYTES_PER_GIGABYTES << "GB)";
     }
 }
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index cab4a4f5b0..2bc694f367 100644
--- a/libraries/networking/src/AssetClient.h
+++ b/libraries/networking/src/AssetClient.h
@@ -49,7 +49,7 @@ using ProgressCallback = std::function<void(qint64 totalReceived, qint64 total)>
 class AssetClient : public QObject, public Dependency {
     Q_OBJECT
 public:
-    AssetClient();
+    AssetClient(const QString& cacheDir="");
 
     Q_INVOKABLE GetMappingRequest* createGetMappingRequest(const AssetPath& path);
     Q_INVOKABLE GetAllMappingsRequest* createGetAllMappingsRequest();
@@ -109,6 +109,8 @@ private:
     std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetInfoCallback>> _pendingInfoRequests;
     std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, UploadResultCallback>> _pendingUploads;
 
+    QString _cacheDir;
+
     friend class AssetRequest;
     friend class AssetUpload;
     friend class MappingRequest;
diff --git a/libraries/networking/src/ResourceManager.cpp b/libraries/networking/src/ResourceManager.cpp
index 3ee66f89c1..e9fe2f1ec1 100644
--- a/libraries/networking/src/ResourceManager.cpp
+++ b/libraries/networking/src/ResourceManager.cpp
@@ -28,7 +28,7 @@
 ResourceManager::ResourceManager() {
     _thread.setObjectName("Resource Manager Thread");
 
-    auto assetClient = DependencyManager::set<AssetClient>();
+    auto assetClient = DependencyManager::set<AssetClient>(_cacheDir);
     assetClient->moveToThread(&_thread);
     QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init);
 
@@ -160,3 +160,7 @@ bool ResourceManager::resourceExists(const QUrl& url) {
     return false;
 }
 
+void ResourceManager::setCacheDir(const QString& cacheDir) {
+    // TODO: check for existence?  
+    _cacheDir = cacheDir;
+}
diff --git a/libraries/networking/src/ResourceManager.h b/libraries/networking/src/ResourceManager.h
index f7495e71e9..4e7cd3d92d 100644
--- a/libraries/networking/src/ResourceManager.h
+++ b/libraries/networking/src/ResourceManager.h
@@ -48,6 +48,9 @@ public:
     // to return to the calling thread so that events can still be processed.
     bool resourceExists(const QUrl& url);
 
+    // adjust where we persist the cache
+    void setCacheDir(const QString& cacheDir);
+
 private:
     QThread _thread;
 
@@ -56,6 +59,7 @@ private:
     PrefixMap _prefixMap;
     QMutex _prefixMapLock;
 
+    QString _cacheDir;
 };
 
 #endif
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index ad15d04db1..240697d890 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -69,7 +69,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
         case PacketType::KillAvatar:
-            return static_cast<PacketVersion>(AvatarMixerPacketVersion::AvatarIdentitySequenceFront);
+            return static_cast<PacketVersion>(AvatarMixerPacketVersion::IsReplicatedInAvatarIdentity);
         case PacketType::MessagesData:
             return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData);
         case PacketType::ICEServerHeartbeat:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 2944c1ce93..6c42193e11 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -247,7 +247,8 @@ enum class AvatarMixerPacketVersion : PacketVersion {
     IdentityPacketsIncludeUpdateTime,
     AvatarIdentitySequenceId,
     MannequinDefaultAvatar,
-    AvatarIdentitySequenceFront
+    AvatarIdentitySequenceFront,
+    IsReplicatedInAvatarIdentity
 };
 
 enum class DomainConnectRequestVersion : PacketVersion {
diff --git a/libraries/plugins/src/plugins/Forward.h b/libraries/plugins/src/plugins/Forward.h
index b95bf4c2e6..90746d648e 100644
--- a/libraries/plugins/src/plugins/Forward.h
+++ b/libraries/plugins/src/plugins/Forward.h
@@ -9,6 +9,7 @@
 
 #include <vector>
 #include <memory>
+#include <functional>
 
 enum class PluginType {
     DISPLAY_PLUGIN,
@@ -26,8 +27,12 @@ class PluginManager;
 
 using DisplayPluginPointer = std::shared_ptr<DisplayPlugin>;
 using DisplayPluginList = std::vector<DisplayPluginPointer>;
+using DisplayPluginProvider = std::function<DisplayPluginList()>;
 using InputPluginPointer = std::shared_ptr<InputPlugin>;
 using InputPluginList = std::vector<InputPluginPointer>;
+using InputPluginProvider = std::function<InputPluginList()>;
 using CodecPluginPointer = std::shared_ptr<CodecPlugin>;
 using CodecPluginList = std::vector<CodecPluginPointer>;
+using CodecPluginProvider = std::function<CodecPluginList()>;
 using SteamClientPluginPointer = std::shared_ptr<SteamClientPlugin>;
+using InputPluginSettingsPersister = std::function<void(const InputPluginList&)>;
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 8471dbc7e8..18ac905ef1 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -24,6 +24,22 @@
 #include "PluginLogging.h"
 
 
+void PluginManager::setDisplayPluginProvider(const DisplayPluginProvider& provider) {
+    _displayPluginProvider = provider;
+}
+
+void PluginManager::setInputPluginProvider(const InputPluginProvider& provider) {
+    _inputPluginProvider = provider;
+}
+
+void PluginManager::setCodecPluginProvider(const CodecPluginProvider& provider) {
+    _codecPluginProvider = provider;
+}
+
+void PluginManager::setInputPluginSettingsPersister(const InputPluginSettingsPersister& persister) {
+    _inputSettingsPersister = persister;
+}
+
 PluginManager* PluginManager::getInstance() {
     static PluginManager _manager;
     return &_manager;
@@ -117,12 +133,12 @@ const LoaderList& getLoadedPlugins() {
 PluginManager::PluginManager() {
 }
 
-extern CodecPluginList getCodecPlugins();
-
 const CodecPluginList& PluginManager::getCodecPlugins() {
     static CodecPluginList codecPlugins;
     static std::once_flag once;
     std::call_once(once, [&] {
+        codecPlugins = _codecPluginProvider();
+
         // Now grab the dynamic plugins
         for (auto loader : getLoadedPlugins()) {
             CodecProvider* codecProvider = qobject_cast<CodecProvider*>(loader->instance());
@@ -163,11 +179,6 @@ const SteamClientPluginPointer PluginManager::getSteamClientPlugin() {
 
 #ifndef Q_OS_ANDROID
 
-// TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
-extern DisplayPluginList getDisplayPlugins();
-extern InputPluginList getInputPlugins();
-
-extern void saveInputPluginSettings(const InputPluginList& plugins);
 static DisplayPluginList displayPlugins;
 
 const DisplayPluginList& PluginManager::getDisplayPlugins() {
@@ -183,7 +194,7 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() {
 
     std::call_once(once, [&] {
         // Grab the built in plugins
-        displayPlugins = ::getDisplayPlugins();
+        displayPlugins = _displayPluginProvider();
 
 
         // Now grab the dynamic plugins
@@ -229,7 +240,7 @@ const InputPluginList& PluginManager::getInputPlugins() {
     };
 
     std::call_once(once, [&] {
-        inputPlugins = ::getInputPlugins();
+        inputPlugins = _inputPluginProvider();
 
         // Now grab the dynamic plugins
         for (auto loader : getLoadedPlugins()) {
@@ -288,7 +299,7 @@ void PluginManager::disableInputs(const QStringList& inputs) {
 }
 
 void PluginManager::saveSettings() {
-    saveInputPluginSettings(getInputPlugins());
+    _inputSettingsPersister(getInputPlugins());
 }
 
 void PluginManager::shutdown() {
diff --git a/libraries/plugins/src/plugins/PluginManager.h b/libraries/plugins/src/plugins/PluginManager.h
index 687e5c9e9b..08fe4fde20 100644
--- a/libraries/plugins/src/plugins/PluginManager.h
+++ b/libraries/plugins/src/plugins/PluginManager.h
@@ -31,6 +31,17 @@ public:
     void setContainer(PluginContainer* container) { _container = container; }
 
     void shutdown();
+
+    // Application that have statically linked plugins can expose them to the plugin manager with these function
+    void setDisplayPluginProvider(const DisplayPluginProvider& provider);
+    void setInputPluginProvider(const InputPluginProvider& provider);
+    void setCodecPluginProvider(const CodecPluginProvider& provider);
+    void setInputPluginSettingsPersister(const InputPluginSettingsPersister& persister);
+    
 private:
+    DisplayPluginProvider _displayPluginProvider { []()->DisplayPluginList { return {}; } };
+    InputPluginProvider _inputPluginProvider { []()->InputPluginList { return {}; } };
+    CodecPluginProvider _codecPluginProvider { []()->CodecPluginList { return {}; } };
+    InputPluginSettingsPersister _inputSettingsPersister { [](const InputPluginList& list) {} };
     PluginContainer* _container { nullptr };
 };
diff --git a/libraries/render-utils/src/DeferredFrameTransform.cpp b/libraries/render-utils/src/DeferredFrameTransform.cpp
index b1166437db..baf523312c 100644
--- a/libraries/render-utils/src/DeferredFrameTransform.cpp
+++ b/libraries/render-utils/src/DeferredFrameTransform.cpp
@@ -39,7 +39,7 @@ void DeferredFrameTransform::update(RenderArgs* args) {
     args->getViewFrustum().evalProjectionMatrix(frameTransformBuffer.projectionMono);
 
     // Running in stero ?
-    bool isStereo = args->_context->isStereo();
+    bool isStereo = args->isStereo();
     if (!isStereo) {
         frameTransformBuffer.projection[0] = frameTransformBuffer.projectionMono;
         frameTransformBuffer.stereoInfo = glm::vec4(0.0f, (float)args->_viewport.z, 0.0f, 0.0f);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 73f0e37d6c..67452c5d33 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -867,10 +867,6 @@ bool Model::getRelativeDefaultJointTranslation(int jointIndex, glm::vec3& transl
     return _rig.getRelativeDefaultJointTranslation(jointIndex, translationOut);
 }
 
-bool Model::getJointCombinedRotation(int jointIndex, glm::quat& rotation) const {
-    return _rig.getJointCombinedRotation(jointIndex, rotation, _rotation);
-}
-
 QStringList Model::getJointNames() const {
     if (QThread::currentThread() != thread()) {
         QStringList result;
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index adee4d57b1..3eb796b763 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -177,7 +177,6 @@ public:
     int getJointStateCount() const { return (int)_rig.getJointStateCount(); }
     bool getJointPositionInWorldFrame(int jointIndex, glm::vec3& position) const;
     bool getJointRotationInWorldFrame(int jointIndex, glm::quat& rotation) const;
-    bool getJointCombinedRotation(int jointIndex, glm::quat& rotation) const;
 
     /// \param jointIndex index of joint in model structure
     /// \param rotation[out] rotation of joint in model-frame
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index b49a066bf7..20c999019b 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -406,7 +406,7 @@ void Blit::run(const RenderContextPointer& renderContext, const gpu::Framebuffer
         batch.setFramebuffer(blitFbo);
 
         if (renderArgs->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
-            if (renderArgs->_context->isStereo()) {
+            if (renderArgs->isStereo()) {
                 gpu::Vec4i srcRectLeft;
                 srcRectLeft.z = width / 2;
                 srcRectLeft.w = height;
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index 1941766353..c4eea7ce7f 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -459,7 +459,7 @@ void SurfaceGeometryPass::run(const render::RenderContextPointer& renderContext,
     auto diffuseVPipeline = _diffusePass.getBlurVPipeline();
     auto diffuseHPipeline = _diffusePass.getBlurHPipeline();
 
-    _diffusePass.getParameters()->setWidthHeight(curvatureViewport.z, curvatureViewport.w, args->_context->isStereo());
+    _diffusePass.getParameters()->setWidthHeight(curvatureViewport.z, curvatureViewport.w, args->isStereo());
     glm::ivec2 textureSize(curvatureTexture->getDimensions());
     _diffusePass.getParameters()->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, curvatureViewport));
     _diffusePass.getParameters()->setDepthPerspective(args->getViewFrustum().getProjection()[1][1]);
diff --git a/libraries/render/src/render/Args.h b/libraries/render/src/render/Args.h
index a75488ce7a..c2e03d4f46 100644
--- a/libraries/render/src/render/Args.h
+++ b/libraries/render/src/render/Args.h
@@ -99,6 +99,8 @@ namespace render {
         void pushViewFrustum(const ViewFrustum& viewFrustum) { _viewFrustums.push(viewFrustum); }
         void popViewFrustum() { _viewFrustums.pop(); }
 
+        bool isStereo() const { return _displayMode != MONO; }
+
         std::shared_ptr<gpu::Context> _context;
         std::shared_ptr<gpu::Framebuffer> _blitFramebuffer;
         std::shared_ptr<render::ShapePipeline> _pipeline;
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index 0a6b3d16fc..73a8e0a0dd 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -217,7 +217,7 @@ void BlurGaussian::run(const RenderContextPointer& renderContext, const gpu::Fra
     auto blurVPipeline = getBlurVPipeline();
     auto blurHPipeline = getBlurHPipeline();
 
-    _parameters->setWidthHeight(args->_viewport.z, args->_viewport.w, args->_context->isStereo());
+    _parameters->setWidthHeight(args->_viewport.z, args->_viewport.w, args->isStereo());
     glm::ivec2 textureSize(blurringResources.sourceTexture->getDimensions());
     _parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, args->_viewport));
 
@@ -330,7 +330,7 @@ void BlurGaussianDepthAware::run(const RenderContextPointer& renderContext, cons
 
     auto sourceViewport = args->_viewport;
 
-    _parameters->setWidthHeight(sourceViewport.z, sourceViewport.w, args->_context->isStereo());
+    _parameters->setWidthHeight(sourceViewport.z, sourceViewport.w, args->isStereo());
     glm::ivec2 textureSize(blurringResources.sourceTexture->getDimensions());
     _parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, sourceViewport));
     _parameters->setDepthPerspective(args->getViewFrustum().getProjection()[1][1]);
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index f56312568e..762d9ffb29 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -9,17 +9,17 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelScriptingInterface.h"
 #include <QScriptEngine>
 #include <QScriptValueIterator>
 #include <QtScript/QScriptValue>
-#include <model-networking/MeshFace.h>
+#include <model-networking/SimpleMeshProxy.h>
 #include "ScriptEngine.h"
 #include "ScriptEngineLogging.h"
-#include "ModelScriptingInterface.h"
 #include "OBJWriter.h"
 
 ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
-    _modelScriptEngine = qobject_cast<ScriptEngine*>(parent);
+    _modelScriptEngine = qobject_cast<QScriptEngine*>(parent);
 
     qScriptRegisterSequenceMetaType<QList<MeshProxy*>>(_modelScriptEngine);
     qScriptRegisterMetaType(_modelScriptEngine, meshFaceToScriptValue, meshFaceFromScriptValue);
@@ -118,7 +118,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
                                                           (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
 
 
-    MeshProxy* resultProxy = new MeshProxy(result);
+    MeshProxy* resultProxy = new SimpleMeshProxy(result);
     return meshToScriptValue(_modelScriptEngine, resultProxy);
 }
 
@@ -134,7 +134,7 @@ QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshPro
     model::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
                                           [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
                                           [&](uint32_t index){ return index; });
-    MeshProxy* resultProxy = new MeshProxy(result);
+    MeshProxy* resultProxy = new SimpleMeshProxy(result);
     return meshToScriptValue(_modelScriptEngine, resultProxy);
 }
 
@@ -188,6 +188,6 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices
 
 
 
-    MeshProxy* meshProxy = new MeshProxy(mesh);
+    MeshProxy* meshProxy = new SimpleMeshProxy(mesh);
     return meshToScriptValue(_modelScriptEngine, meshProxy);
 }
diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h
index d899f532d8..ba23623acf 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.h
+++ b/libraries/script-engine/src/ModelScriptingInterface.h
@@ -9,19 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-
 #ifndef hifi_ModelScriptingInterface_h
 #define hifi_ModelScriptingInterface_h
 
 #include <QtCore/QObject>
-#include <QScriptValue>
-#include <OBJWriter.h>
-#include <model/Geometry.h>
-#include <model-networking/MeshProxy.h>
-#include <model-networking/MeshFace.h>
 
-using MeshPointer = std::shared_ptr<model::Mesh>;
-class ScriptEngine;
+#include <RegisteredMetaTypes.h>
+class QScriptEngine;
 
 class ModelScriptingInterface : public QObject {
     Q_OBJECT
@@ -37,7 +31,7 @@ public:
                                      const QVector<MeshFace>& faces);
 
 private:
-    ScriptEngine* _modelScriptEngine { nullptr };
+    QScriptEngine* _modelScriptEngine { nullptr };
 };
 
 #endif // hifi_ModelScriptingInterface_h
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index 98838441d2..7583f562e6 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -8,9 +8,17 @@
 
 #include "RecordingScriptingInterface.h"
 
+#include <QStandardPaths>
 #include <QtCore/QThread>
+#include <QtCore/QUrl>
+#include <QtScript/QScriptValue>
+#include <QtWidgets/QFileDialog>
 
+#include <AssetClient.h>
+#include <AssetUpload.h>
+#include <BuildInfo.h>
 #include <NumericalConstants.h>
+#include <PathUtils.h>
 #include <Transform.h>
 #include <recording/Deck.h>
 #include <recording/Recorder.h>
@@ -18,13 +26,6 @@
 #include <recording/Frame.h>
 #include <recording/ClipCache.h>
 
-
-#include <QtScript/QScriptValue>
-#include <AssetClient.h>
-#include <AssetUpload.h>
-#include <QtCore/QUrl>
-#include <QtWidgets/QFileDialog>
-
 #include "ScriptEngineLogging.h"
 
 using namespace recording;
@@ -188,6 +189,14 @@ void RecordingScriptingInterface::stopRecording() {
     _lastClip->seek(0);
 }
 
+QString RecordingScriptingInterface::getDefaultRecordingSaveDirectory() {
+    QString directory = PathUtils::getAppLocalDataPath() + "Avatar Recordings/";
+    if (!QDir(directory).exists()) {
+        QDir().mkdir(directory);
+    }
+    return directory;
+}
+
 void RecordingScriptingInterface::saveRecording(const QString& filename) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "saveRecording", Qt::BlockingQueuedConnection,
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h
index a9fdf1deb4..c4220958a2 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.h
+++ b/libraries/script-engine/src/RecordingScriptingInterface.h
@@ -65,6 +65,7 @@ public slots:
 
     float recorderElapsed() const;
 
+    QString getDefaultRecordingSaveDirectory();
     void saveRecording(const QString& filename);
     bool saveRecordingToAsset(QScriptValue getClipAtpUrl);
     void loadLastRecording();
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 59694cba6f..11bb044d72 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -1067,24 +1067,21 @@ void ScriptEngine::run() {
         // on shutdown and stop... so we want to loop and sleep until we've spent our time in
         // purgatory, constantly checking to see if our script was asked to end
         bool processedEvents = false;
-        while (!_isFinished && clock::now() < sleepUntil) {
-
-            {
-                PROFILE_RANGE(script, "processEvents-sleep");
-                QCoreApplication::processEvents(); // before we sleep again, give events a chance to process
+        if (!_isFinished) {
+            PROFILE_RANGE(script, "processEvents-sleep");
+            std::chrono::milliseconds sleepFor =
+                std::chrono::duration_cast<std::chrono::milliseconds>(sleepUntil - clock::now());
+            if (sleepFor > std::chrono::milliseconds(0)) {
+                QEventLoop loop;
+                QTimer timer;
+                timer.setSingleShot(true);
+                connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+                timer.start(sleepFor.count());
+                loop.exec();
+            } else {
+                QCoreApplication::processEvents();
             }
             processedEvents = true;
-
-            // If after processing events, we're past due, exit asap
-            if (clock::now() >= sleepUntil) {
-                break;
-            }
-
-            // We only want to sleep a small amount so that any pending events (like timers or invokeMethod events)
-            // will be able to process quickly.
-            static const int SMALL_SLEEP_AMOUNT = 100;
-            auto smallSleepUntil = clock::now() + static_cast<std::chrono::microseconds>(SMALL_SLEEP_AMOUNT);
-            std::this_thread::sleep_until(smallSleepUntil);
         }
 
         PROFILE_RANGE(script, "ScriptMainLoop");
@@ -1309,6 +1306,7 @@ QObject* ScriptEngine::setupTimerWithInterval(const QScriptValue& function, int
     // make sure the timer stops when the script does
     connect(this, &ScriptEngine::scriptEnding, newTimer, &QTimer::stop);
 
+
     CallbackData timerData = { function, currentEntityIdentifier, currentSandboxURL };
     _timerFunctionMap.insert(newTimer, timerData);
 
@@ -1392,6 +1390,15 @@ void ScriptEngine::print(const QString& message) {
     emit printedMessage(message, getFilename());
 }
 
+
+void ScriptEngine::beginProfileRange(const QString& label) const {
+    PROFILE_SYNC_BEGIN(script, label.toStdString().c_str(), label.toStdString().c_str());
+}
+
+void ScriptEngine::endProfileRange(const QString& label) const {
+    PROFILE_SYNC_END(script, label.toStdString().c_str(), label.toStdString().c_str());
+}
+
 // Script.require.resolve -- like resolvePath, but performs more validation and throws exceptions on invalid module identifiers (for consistency with Node.js)
 QString ScriptEngine::_requireResolve(const QString& moduleId, const QString& relativeTo) {
     if (!IS_THREADSAFE_INVOCATION(thread(), __FUNCTION__)) {
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 9da8603814..7c473a305b 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -43,6 +43,7 @@
 #include "Vec3.h"
 #include "ConsoleScriptingInterface.h"
 #include "SettingHandle.h"
+#include "Profile.h"
 
 class QScriptEngineDebugger;
 
@@ -182,6 +183,8 @@ public:
     Q_INVOKABLE void print(const QString& message);
     Q_INVOKABLE QUrl resolvePath(const QString& path) const;
     Q_INVOKABLE QUrl resourcesPath() const;
+    Q_INVOKABLE void beginProfileRange(const QString& label) const;
+    Q_INVOKABLE void endProfileRange(const QString& label) const;
 
     // Entity Script Related methods
     Q_INVOKABLE bool isEntityScriptRunning(const EntityItemID& entityID) {
diff --git a/libraries/shared/src/AudioHelpers.h b/libraries/shared/src/AudioHelpers.h
index b43764ef5d..1dcc11af0c 100644
--- a/libraries/shared/src/AudioHelpers.h
+++ b/libraries/shared/src/AudioHelpers.h
@@ -14,6 +14,8 @@
 
 #include <stdint.h>
 
+#include <NumericalConstants.h>
+
 const int IEEE754_MANT_BITS = 23;
 const int IEEE754_EXPN_BIAS = 127;
 
@@ -66,6 +68,48 @@ static inline float fastExp2f(float x) {
     return x * xi.f;
 }
 
+//
+// on x86 architecture, assume that SSE2 is present
+//
+#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__x86_64__)
+
+#include <xmmintrin.h>
+// inline sqrtss, without requiring /fp:fast
+static inline float fastSqrtf(float x) {   
+    return _mm_cvtss_f32(_mm_sqrt_ss(_mm_set_ss(x)));
+}
+
+#else 
+
+static inline float fastSqrtf(float x) {   
+    return sqrtf(x);
+}
+
+#endif
+
+//
+// for -1 <= x <= 1, returns acos(x)
+// otherwise, returns NaN
+//
+// abs |error| < 7e-5, smooth
+//
+static inline float fastAcosf(float x) {
+
+    union { float f; int32_t i; } xi = { x };
+
+    int32_t sign = xi.i & 0x80000000;
+    xi.i ^= sign;   // fabs(x)
+
+    // compute sqrt(1-x) in parallel
+    float r = fastSqrtf(1.0f - xi.f);
+
+    // polynomial for acos(x)/sqrt(1-x) over x=[0,1]
+    xi.f = ((-0.0198439236f * xi.f + 0.0762021306f) * xi.f + -0.212940971f) * xi.f + 1.57079633f;
+
+    xi.f *= r;
+    return (sign ? PI - xi.f : xi.f);
+}
+
 //
 // Quantize a non-negative gain value to the nearest 0.5dB, and pack to a byte.
 //
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index ef92552d1f..3386ea2c22 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -17,6 +17,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/quaternion.hpp>
+#include <glm/gtx/component_wise.hpp>
 
 // Bring the most commonly used GLM types into the default namespace
 using glm::ivec2;
diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 9bf9d7bdcf..1fe9e2f83d 100644
--- a/libraries/shared/src/PathUtils.cpp
+++ b/libraries/shared/src/PathUtils.cpp
@@ -34,7 +34,18 @@ QString PathUtils::getAppDataPath() {
     return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/";
 }
 
-QString PathUtils::getAppLocalDataPath() {
+QString PathUtils::getAppLocalDataPath(const QString& overridePath /* = "" */) {
+    static QString overriddenPath = "";
+    // set the overridden path if one was passed in
+    if (!overridePath.isEmpty()) {
+        overriddenPath = overridePath;
+    }
+    // return overridden path if set
+    if (!overriddenPath.isEmpty()) {
+        return overriddenPath;
+    }
+
+    // otherwise return standard path
     return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/";
 }
 
diff --git a/libraries/shared/src/PathUtils.h b/libraries/shared/src/PathUtils.h
index 14eb81dd9a..42dd09c8b0 100644
--- a/libraries/shared/src/PathUtils.h
+++ b/libraries/shared/src/PathUtils.h
@@ -28,7 +28,7 @@ public:
     static const QString& resourcesPath();
 
     static QString getAppDataPath();
-    static QString getAppLocalDataPath();
+    static QString getAppLocalDataPath(const QString& overridePath = "");
 
     static QString getAppDataFilePath(const QString& filename);
     static QString getAppLocalDataFilePath(const QString& filename);
diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h
index ee09298deb..5de4e8f41a 100644
--- a/libraries/shared/src/Profile.h
+++ b/libraries/shared/src/Profile.h
@@ -46,6 +46,20 @@ private:
     const QLoggingCategory& _category;
 };
 
+
+inline void syncBegin(const QLoggingCategory& category, const QString& name, const QString& id, const QVariantMap& args = QVariantMap(), const QVariantMap& extra = QVariantMap()) {
+    if (category.isDebugEnabled()) {
+        tracing::traceEvent(category, name, tracing::DurationBegin, id, args, extra);
+    }
+}
+
+
+inline void syncEnd(const QLoggingCategory& category, const QString& name, const QString& id, const QVariantMap& args = QVariantMap(), const QVariantMap& extra = QVariantMap()) {
+    if (category.isDebugEnabled()) {
+        tracing::traceEvent(category, name, tracing::DurationEnd, id, args, extra);
+    }
+}
+
 inline void asyncBegin(const QLoggingCategory& category, const QString& name, const QString& id, const QVariantMap& args = QVariantMap(), const QVariantMap& extra = QVariantMap()) {
     if (category.isDebugEnabled()) {
         tracing::traceEvent(category, name, tracing::AsyncNestableStart, id, args, extra);
@@ -80,6 +94,8 @@ inline void metadata(const QString& metadataType, const QVariantMap& args) {
 #define PROFILE_RANGE_EX(category, name, argbColor, payload, ...) Duration profileRangeThis(trace_##category(), name, argbColor, (uint64_t)payload, ##__VA_ARGS__);
 #define PROFILE_RANGE_BEGIN(category, rangeId, name, argbColor) rangeId = Duration::beginRange(trace_##category(), name, argbColor)
 #define PROFILE_RANGE_END(category, rangeId) Duration::endRange(trace_##category(), rangeId)
+#define PROFILE_SYNC_BEGIN(category, name, id, ...) syncBegin(trace_##category(), name, id, ##__VA_ARGS__);
+#define PROFILE_SYNC_END(category, name, id, ...) syncEnd(trace_##category(), name, id, ##__VA_ARGS__);
 #define PROFILE_ASYNC_BEGIN(category, name, id, ...) asyncBegin(trace_##category(), name, id, ##__VA_ARGS__);
 #define PROFILE_ASYNC_END(category, name, id, ...) asyncEnd(trace_##category(), name, id, ##__VA_ARGS__);
 #define PROFILE_COUNTER_IF_CHANGED(category, name, type, value) { static type lastValue = 0; type newValue = value;  if (newValue != lastValue) { counter(trace_##category(), name, { { name, newValue }}); lastValue = newValue; } }
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index f793b78b39..b30637c83f 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -9,6 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "RegisteredMetaTypes.h"
+
+#include <glm/gtc/quaternion.hpp>
+
 #include <QtCore/QUrl>
 #include <QtCore/QUuid>
 #include <QtCore/QRect>
@@ -17,10 +21,9 @@
 #include <QtGui/QVector2D>
 #include <QtGui/QVector3D>
 #include <QtGui/QQuaternion>
-#include <glm/gtc/quaternion.hpp>
-#include <QAbstractSocket>
-
-#include "RegisteredMetaTypes.h"
+#include <QtNetwork/QAbstractSocket>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptValueIterator>
 
 int vec4MetaTypeId = qRegisterMetaType<glm::vec4>();
 int vec3MetaTypeId = qRegisterMetaType<glm::vec3>();
@@ -798,3 +801,101 @@ void qSizeFFromScriptValue(const QScriptValue& object, QSizeF& qSizeF) {
     qSizeF.setWidth(object.property("width").toVariant().toFloat());
     qSizeF.setHeight(object.property("height").toVariant().toFloat());
 }
+
+AnimationDetails::AnimationDetails() :
+    role(), url(), fps(0.0f), priority(0.0f), loop(false), hold(false),
+    startAutomatically(false), firstFrame(0.0f), lastFrame(0.0f), running(false), currentFrame(0.0f) {
+}
+
+AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
+    bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame) :
+    role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold),
+    startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame),
+    running(running), currentFrame(currentFrame) {
+}
+
+
+QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& details) {
+    QScriptValue obj = engine->newObject();
+    obj.setProperty("role", details.role);
+    obj.setProperty("url", details.url.toString());
+    obj.setProperty("fps", details.fps);
+    obj.setProperty("priority", details.priority);
+    obj.setProperty("loop", details.loop);
+    obj.setProperty("hold", details.hold);
+    obj.setProperty("startAutomatically", details.startAutomatically);
+    obj.setProperty("firstFrame", details.firstFrame);
+    obj.setProperty("lastFrame", details.lastFrame);
+    obj.setProperty("running", details.running);
+    obj.setProperty("currentFrame", details.currentFrame);
+    return obj;
+}
+
+void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& details) {
+    // nothing for now...
+}
+
+QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in) {
+    return engine->newQObject(in, QScriptEngine::QtOwnership,
+        QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
+}
+
+void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out) {
+    out = qobject_cast<MeshProxy*>(value.toQObject());
+}
+
+QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in) {
+    // QScriptValueList result;
+    QScriptValue result = engine->newArray();
+    int i = 0;
+    foreach(MeshProxy* const meshProxy, in) {
+        result.setProperty(i++, meshToScriptValue(engine, meshProxy));
+    }
+    return result;
+}
+
+void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out) {
+    QScriptValueIterator itr(value);
+
+    qDebug() << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32();
+
+    while (itr.hasNext()) {
+        itr.next();
+        MeshProxy* meshProxy = qscriptvalue_cast<MeshProxyList::value_type>(itr.value());
+        if (meshProxy) {
+            out.append(meshProxy);
+        } else {
+            qDebug() << "null meshProxy";
+        }
+    }
+}
+
+
+QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace) {
+    QScriptValue obj = engine->newObject();
+    obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
+    return obj;
+}
+
+void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult) {
+    qVectorIntFromScriptValue(object.property("vertices"), meshFaceResult.vertexIndices);
+}
+
+QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector) {
+    QScriptValue array = engine->newArray();
+    for (int i = 0; i < vector.size(); i++) {
+        array.setProperty(i, meshFaceToScriptValue(engine, vector.at(i)));
+    }
+    return array;
+}
+
+void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result) {
+    int length = array.property("length").toInteger();
+    result.clear();
+
+    for (int i = 0; i < length; i++) {
+        MeshFace meshFace = MeshFace();
+        meshFaceFromScriptValue(array.property(i), meshFace);
+        result << meshFace;
+    }
+}
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 255a8115a1..123c769a96 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -14,6 +14,7 @@
 
 #include <QtScript/QScriptEngine>
 #include <QtCore/QUuid>
+#include <QtCore/QUrl>
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
@@ -169,4 +170,73 @@ void quuidFromScriptValue(const QScriptValue& object, QUuid& uuid);
 QScriptValue qSizeFToScriptValue(QScriptEngine* engine, const QSizeF& qSizeF);
 void qSizeFFromScriptValue(const QScriptValue& object, QSizeF& qSizeF);
 
+class AnimationDetails {
+public:
+    AnimationDetails();
+    AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
+        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame);
+
+    QString role;
+    QUrl url;
+    float fps;
+    float priority;
+    bool loop;
+    bool hold;
+    bool startAutomatically;
+    float firstFrame;
+    float lastFrame;
+    bool running;
+    float currentFrame;
+};
+Q_DECLARE_METATYPE(AnimationDetails);
+QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& event);
+void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& event);
+
+namespace model {
+    class Mesh;
+}
+
+using MeshPointer = std::shared_ptr<model::Mesh>;
+
+
+class MeshProxy : public QObject {
+    Q_OBJECT
+
+public:
+    virtual MeshPointer getMeshPointer() const = 0;
+    Q_INVOKABLE virtual int getNumVertices() const = 0;
+    Q_INVOKABLE virtual glm::vec3 getPos3(int index) const = 0;
+};
+
+Q_DECLARE_METATYPE(MeshProxy*);
+
+class MeshProxyList : public QList<MeshProxy*> {}; // typedef and using fight with the Qt macros/templates, do this instead
+Q_DECLARE_METATYPE(MeshProxyList);
+
+
+QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in);
+void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out);
+
+QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in);
+void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out);
+
+class MeshFace {
+
+public:
+    MeshFace() {}
+    ~MeshFace() {}
+
+    QVector<uint32_t> vertexIndices;
+    // TODO -- material...
+};
+
+Q_DECLARE_METATYPE(MeshFace)
+Q_DECLARE_METATYPE(QVector<MeshFace>)
+
+QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace);
+void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult);
+QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector);
+void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result);
+
+
 #endif // hifi_RegisteredMetaTypes_h
diff --git a/libraries/animation/src/AnimationLoop.cpp b/libraries/shared/src/shared/types/AnimationLoop.cpp
similarity index 95%
rename from libraries/animation/src/AnimationLoop.cpp
rename to libraries/shared/src/shared/types/AnimationLoop.cpp
index 3d7bca863f..f77bd8bb2a 100644
--- a/libraries/animation/src/AnimationLoop.cpp
+++ b/libraries/shared/src/shared/types/AnimationLoop.cpp
@@ -9,11 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <NumericalConstants.h>
-
-#include "AnimationCache.h"
 #include "AnimationLoop.h"
 
+#include "../../NumericalConstants.h"
+#include "../../SharedUtil.h"
+#include "../../GLMHelpers.h"
+#include "../../RegisteredMetaTypes.h"
+
 const float AnimationLoop::MAXIMUM_POSSIBLE_FRAME = 100000.0f;
 
 AnimationLoop::AnimationLoop() :
@@ -62,7 +64,7 @@ AnimationLoop::AnimationLoop(float fps, bool loop, bool hold, bool startAutomati
 {
 }
 
-void AnimationLoop::simulateAtTime(quint64 now) {
+void AnimationLoop::simulateAtTime(uint64_t now) {
     float deltaTime = (float)(now - _lastSimulated) / (float)USECS_PER_SECOND;
     _lastSimulated = now;
     simulate(deltaTime);
diff --git a/libraries/animation/src/AnimationLoop.h b/libraries/shared/src/shared/types/AnimationLoop.h
similarity index 93%
rename from libraries/animation/src/AnimationLoop.h
rename to libraries/shared/src/shared/types/AnimationLoop.h
index 6adfbf35e2..33434209e7 100644
--- a/libraries/animation/src/AnimationLoop.h
+++ b/libraries/shared/src/shared/types/AnimationLoop.h
@@ -14,6 +14,9 @@
 
 class AnimationDetails;
 
+#include <stdint.h>
+#include <glm/glm.hpp>
+
 class AnimationLoop {
 public:
     static const float MAXIMUM_POSSIBLE_FRAME;
@@ -58,7 +61,7 @@ public:
     void stop() { setRunning(false); }
     void simulate(float deltaTime); /// call this with deltaTime if you as the caller are managing the delta time between calls
 
-    void simulateAtTime(quint64 now); /// call this with "now" if you want the animationLoop to handle delta times
+    void simulateAtTime(uint64_t now); /// call this with "now" if you want the animationLoop to handle delta times
 
 private:
     float _fps;
@@ -71,7 +74,7 @@ private:
     float _currentFrame;
     float _maxFrameIndexHint;
     bool _resetOnRunning;
-    quint64 _lastSimulated;
+    uint64_t _lastSimulated;
 };
 
 #endif // hifi_AnimationLoop_h
diff --git a/plugins/hifiCodec/CMakeLists.txt b/plugins/hifiCodec/CMakeLists.txt
index 15572e8266..28c1dc3807 100644
--- a/plugins/hifiCodec/CMakeLists.txt
+++ b/plugins/hifiCodec/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 set(TARGET_NAME hifiCodec)
 setup_hifi_client_server_plugin()
-link_hifi_libraries(audio plugins input-plugins display-plugins)
+link_hifi_libraries(audio plugins)
 add_dependency_external_projects(hifiAudioCodec)
 target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES})
diff --git a/plugins/hifiNeuron/CMakeLists.txt b/plugins/hifiNeuron/CMakeLists.txt
index e3a725ca2f..a9ed8cca6e 100644
--- a/plugins/hifiNeuron/CMakeLists.txt
+++ b/plugins/hifiNeuron/CMakeLists.txt
@@ -10,7 +10,7 @@ if (APPLE OR WIN32)
     
     set(TARGET_NAME hifiNeuron)
     setup_hifi_plugin(Script Qml Widgets)
-    link_hifi_libraries(shared controllers ui plugins input-plugins display-plugins)
+    link_hifi_libraries(shared controllers ui plugins input-plugins)
     target_neuron()
 
 endif()
diff --git a/plugins/hifiSdl2/CMakeLists.txt b/plugins/hifiSdl2/CMakeLists.txt
index 86bda5a15d..7e499e314a 100644
--- a/plugins/hifiSdl2/CMakeLists.txt
+++ b/plugins/hifiSdl2/CMakeLists.txt
@@ -8,5 +8,5 @@
 
 set(TARGET_NAME hifiSdl2)
 setup_hifi_plugin(Script Qml Widgets)
-link_hifi_libraries(shared controllers ui plugins input-plugins script-engine display-plugins)
+link_hifi_libraries(shared controllers ui plugins input-plugins script-engine)
 target_sdl2()
diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt
index 54884bddff..14676217db 100644
--- a/plugins/hifiSixense/CMakeLists.txt
+++ b/plugins/hifiSixense/CMakeLists.txt
@@ -9,6 +9,6 @@
 if (NOT ANDROID)
   set(TARGET_NAME hifiSixense)
   setup_hifi_plugin(Script Qml Widgets)
-  link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins display-plugins)
+  link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
   target_sixense()
 endif ()
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index d914cdcfad..648373ccc2 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -959,15 +959,33 @@ void ViveControllerManager::InputDevice::calibrateFeet(glm::mat4& defaultToRefer
     controller::Pose& secondFootPose = secondFoot.second;
     
     if (determineLimbOrdering(firstFootPose, secondFootPose, headXAxis, headPosition)) {
-        _jointToPuckMap[controller::LEFT_FOOT] = firstFoot.first;
-        _pucksOffset[firstFoot.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultLeftFoot, firstFootPose);
-        _jointToPuckMap[controller::RIGHT_FOOT] = secondFoot.first;
-        _pucksOffset[secondFoot.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultRightFoot, secondFootPose);   
+        calibrateFoot(defaultToReferenceMat, inputCalibration, firstFoot, true);
+        calibrateFoot(defaultToReferenceMat, inputCalibration, secondFoot, false);
     } else {
-        _jointToPuckMap[controller::LEFT_FOOT] = secondFoot.first;
-        _pucksOffset[secondFoot.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultLeftFoot, secondFootPose);
-        _jointToPuckMap[controller::RIGHT_FOOT] = firstFoot.first;
-        _pucksOffset[firstFoot.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultRightFoot, firstFootPose);
+        calibrateFoot(defaultToReferenceMat, inputCalibration, secondFoot, true);
+        calibrateFoot(defaultToReferenceMat, inputCalibration, firstFoot, false);
+    }
+}
+
+void ViveControllerManager::InputDevice::calibrateFoot(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot){
+    controller::Pose footPose = footPair.second;
+    glm::mat4 puckPoseAvatarMat = createMatFromQuatAndPos(footPose.getRotation(), footPose.getTranslation());
+    glm::mat4 defaultFoot = isLeftFoot ? inputCalibration.defaultLeftFoot : inputCalibration.defaultRightFoot;
+    glm::mat4 footOffset = computeOffset(defaultToReferenceMat, defaultFoot, footPose);
+
+    glm::quat rotationOffset = glmExtractRotation(footOffset);
+    glm::vec3 translationOffset = extractTranslation(footOffset);
+    glm::vec3 avatarXAxisInPuckFrame = glm::normalize(transformVectorFast(glm::inverse(puckPoseAvatarMat), glm::vec3(-1.0f, 0.0f, 0.0f)));
+    float distance = glm::dot(translationOffset, avatarXAxisInPuckFrame);
+    glm::vec3 finalTranslation =  translationOffset - (distance * avatarXAxisInPuckFrame);
+    glm::mat4 finalOffset = createMatFromQuatAndPos(rotationOffset, finalTranslation);
+
+    if (isLeftFoot) {
+        _jointToPuckMap[controller::LEFT_FOOT] = footPair.first;
+        _pucksOffset[footPair.first] = finalOffset;
+    } else {
+        _jointToPuckMap[controller::RIGHT_FOOT] = footPair.first;
+        _pucksOffset[footPair.first] = finalOffset;
     }
 }
 
diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h
index 67a9ff46fd..0b0406bb60 100644
--- a/plugins/openvr/src/ViveControllerManager.h
+++ b/plugins/openvr/src/ViveControllerManager.h
@@ -98,6 +98,7 @@ private:
         void calibrateLeftHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
         void calibrateRightHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
         void calibrateFeet(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateFoot(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot);
         void calibrateHips(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
         void calibrateChest(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
         void calibrateShoulders(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration,
diff --git a/plugins/pcmCodec/CMakeLists.txt b/plugins/pcmCodec/CMakeLists.txt
index 5e52705033..900a642a88 100644
--- a/plugins/pcmCodec/CMakeLists.txt
+++ b/plugins/pcmCodec/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 set(TARGET_NAME pcmCodec)
 setup_hifi_client_server_plugin()
-link_hifi_libraries(shared plugins input-plugins display-plugins)
+link_hifi_libraries(shared plugins)
 install_beside_console()
 
diff --git a/scripts/developer/EZrecord.js b/scripts/developer/EZrecord.js
new file mode 100644
index 0000000000..7fdebada79
--- /dev/null
+++ b/scripts/developer/EZrecord.js
@@ -0,0 +1,275 @@
+"use strict";
+
+//
+//  EZrecord.js
+//
+//  Created by David Rowe on 24 Jun 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function () {
+
+    var APP_NAME = "EZRECORD",
+        APP_ICON_INACTIVE = "icons/tablet-icons/avatar-record-i.svg",
+        APP_ICON_ACTIVE = "icons/tablet-icons/avatar-record-a.svg",
+        SHORTCUT_KEY = "r",  // Alt modifier is assumed.
+        tablet,
+        button,
+
+        RecordingIndicator,
+        Recorder;
+
+    function log(message) {
+        print(APP_NAME + ": " + message);
+    }
+
+    function logDetails() {
+        return {
+            current_domain: location.placename
+        };
+    }
+
+    RecordingIndicator = (function () {
+        // Displays "recording" overlay.
+
+        var hmdOverlay,
+            HMD_FONT_SIZE = 0.08,
+            desktopOverlay,
+            DESKTOP_FONT_SIZE = 24;
+
+        function show() {
+            // Create both overlays in case user switches desktop/HMD mode.
+            var screenSize = Controller.getViewportDimensions(),
+                recordingText = "REC",  // Unicode circle \u25cf doesn't render in HMD.
+                CAMERA_JOINT_INDEX = -7;
+
+            if (HMD.active) {
+                // 3D overlay attached to avatar.
+                hmdOverlay = Overlays.addOverlay("text3d", {
+                    text: recordingText,
+                    dimensions: { x: 3 * HMD_FONT_SIZE, y: HMD_FONT_SIZE },
+                    parentID: MyAvatar.sessionUUID,
+                    parentJointIndex: CAMERA_JOINT_INDEX,
+                    localPosition: { x: 0.95, y: 0.95, z: -2.0 },
+                    color: { red: 255, green: 0, blue: 0 },
+                    alpha: 0.9,
+                    lineHeight: HMD_FONT_SIZE,
+                    backgroundAlpha: 0,
+                    ignoreRayIntersection: true,
+                    isFacingAvatar: true,
+                    drawInFront: true,
+                    visible: true
+                });
+            } else {
+                // 2D overlay on desktop.
+                desktopOverlay = Overlays.addOverlay("text", {
+                    text: recordingText,
+                    width: 3 * DESKTOP_FONT_SIZE,
+                    height: DESKTOP_FONT_SIZE,
+                    x: screenSize.x - 4 * DESKTOP_FONT_SIZE,
+                    y: DESKTOP_FONT_SIZE,
+                    font: { size: DESKTOP_FONT_SIZE },
+                    color: { red: 255, green: 8, blue: 8 },
+                    alpha: 1.0,
+                    backgroundAlpha: 0,
+                    visible: true
+                });
+            }
+        }
+
+        function hide() {
+            if (desktopOverlay) {
+                Overlays.deleteOverlay(desktopOverlay);
+            }
+            if (hmdOverlay) {
+                Overlays.deleteOverlay(hmdOverlay);
+            }
+        }
+
+        return {
+            show: show,
+            hide: hide
+        };
+    }());
+
+    Recorder = (function () {
+        var IDLE = 0,
+            COUNTING_DOWN = 1,
+            RECORDING = 2,
+            recordingState = IDLE,
+
+            countdownTimer,
+            countdownSeconds,
+            COUNTDOWN_SECONDS = 3,
+
+            tickSound,
+            startRecordingSound,
+            finishRecordingSound,
+            TICK_SOUND = "../system/assets/sounds/countdown-tick.wav",
+            START_RECORDING_SOUND = "../system/assets/sounds/start-recording.wav",
+            FINISH_RECORDING_SOUND = "../system/assets/sounds/finish-recording.wav",
+            START_RECORDING_SOUND_DURATION = 1200,
+            SOUND_VOLUME = 0.2;
+
+        function playSound(sound) {
+            Audio.playSound(sound, {
+                position: MyAvatar.position,
+                localOnly: true,
+                volume: SOUND_VOLUME
+            });
+        }
+
+        function isRecording() {
+            return recordingState === COUNTING_DOWN || recordingState === RECORDING;
+        }
+
+        function startRecording() {
+            if (recordingState !== IDLE) {
+                return;
+            }
+
+            log("Start countdown");
+            countdownSeconds = COUNTDOWN_SECONDS;
+            playSound(tickSound);
+            countdownTimer = Script.setInterval(function () {
+                countdownSeconds -= 1;
+                if (countdownSeconds <= 0) {
+                    Script.clearInterval(countdownTimer);
+                    playSound(startRecordingSound);
+                    log("Start recording");
+                    Script.setTimeout(function () {
+                        // Delay start so that start beep is not included in recorded sound.
+                        Recording.startRecording();
+                        RecordingIndicator.show();
+                    }, START_RECORDING_SOUND_DURATION);
+                    recordingState = RECORDING;
+                } else {
+                    playSound(tickSound);
+                }
+            }, 1000);
+
+            recordingState = COUNTING_DOWN;
+        }
+
+        function cancelRecording() {
+            log("Cancel recording");
+            if (recordingState === COUNTING_DOWN) {
+                Script.clearInterval(countdownTimer);
+            } else {
+                Recording.stopRecording();
+                RecordingIndicator.hide();
+            }
+            recordingState = IDLE;
+        }
+
+        function finishRecording() {
+            playSound(finishRecordingSound);
+            Recording.stopRecording();
+            RecordingIndicator.hide();
+            var filename = (new Date()).toISOString();  // yyyy-mm-ddThh:mm:ss.sssZ
+            filename = filename.replace(/[\-:]|\.\d*Z$/g, "").replace("T", "-") + ".hfr";  // yyyymmmdd-hhmmss.hfr
+            filename = Recording.getDefaultRecordingSaveDirectory() + filename;
+            log("Finish recording: " + filename);
+            Recording.saveRecording(filename);
+            recordingState = IDLE;
+            UserActivityLogger.logAction("ezrecord_finish_recording", logDetails());
+        }
+
+        function stopRecording() {
+            if (recordingState === COUNTING_DOWN) {
+                cancelRecording();
+            } else if (recordingState === RECORDING) {
+                finishRecording();
+            }
+        }
+
+        function setUp() {
+            tickSound = SoundCache.getSound(Script.resolvePath(TICK_SOUND));
+            startRecordingSound = SoundCache.getSound(Script.resolvePath(START_RECORDING_SOUND));
+            finishRecordingSound = SoundCache.getSound(Script.resolvePath(FINISH_RECORDING_SOUND));
+        }
+
+        function tearDown() {
+            if (recordingState !== IDLE) {
+                cancelRecording();
+            }
+        }
+
+        return {
+            isRecording: isRecording,
+            startRecording: startRecording,
+            stopRecording: stopRecording,
+            setUp: setUp,
+            tearDown: tearDown
+        };
+    }());
+
+    function toggleRecording() {
+        if (Recorder.isRecording()) {
+            Recorder.stopRecording();
+        } else {
+            Recorder.startRecording();
+        }
+        button.editProperties({ isActive: Recorder.isRecording() });
+    }
+
+    function onKeyPressEvent(event) {
+        if (event.isAlt && event.text === SHORTCUT_KEY && !event.isControl && !event.isMeta && !event.isAutoRepeat) {
+            toggleRecording();
+        }
+    }
+
+    function onButtonClicked() {
+        toggleRecording();
+    }
+
+    function setUp() {
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        if (!tablet) {
+            return;
+        }
+
+        Recorder.setUp();
+
+        // Tablet/toolbar button.
+        button = tablet.addButton({
+            icon: APP_ICON_INACTIVE,
+            activeIcon: APP_ICON_ACTIVE,
+            text: APP_NAME,
+            isActive: false
+        });
+        if (button) {
+            button.clicked.connect(onButtonClicked);
+        }
+
+        Controller.keyPressEvent.connect(onKeyPressEvent);
+
+        UserActivityLogger.logAction("ezrecord_run_script", logDetails());
+    }
+
+    function tearDown() {
+
+        Controller.keyPressEvent.disconnect(onKeyPressEvent);
+
+        Recorder.tearDown();
+
+        if (!tablet) {
+            return;
+        }
+
+        if (button) {
+            button.clicked.disconnect(onButtonClicked);
+            tablet.removeButton(button);
+            button = null;
+        }
+
+        tablet = null;
+
+    }
+
+    setUp();
+    Script.scriptEnding.connect(tearDown);
+}());
diff --git a/scripts/developer/tests/puck-attach.js b/scripts/developer/tests/puck-attach.js
new file mode 100644
index 0000000000..2d0a2e6d02
--- /dev/null
+++ b/scripts/developer/tests/puck-attach.js
@@ -0,0 +1,174 @@
+//
+//  Created by Anthony J. Thibault on 2017/06/20
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+//  When this script is running, a new app button, named "PUCKTACH", will be added to the toolbar/tablet.
+//  Click this app to bring up the puck attachment panel.  This panel contains the following fields.
+//
+//  * Tracked Object - A drop down list of all the available pucks found.  If no pucks are found this list will only have a single NONE entry.
+//    Closing and re-opening the app will refresh this list.
+//  * Model URL - A model url of the model you wish to be attached to the specified puck.
+//  * Position X, Y, Z - used to apply an offset between the puck and the attached model.
+//  * Rot X, Y, Z - used to apply euler angle offsets, in degrees, between the puck and the attached model.
+//  * Create Attachment - when this button is pressed a new Entity will be created at the specified puck's location.
+//    If a puck atttachment already exists, it will be destroyed before the new entity is created.
+//  * Destroy Attachmetn - destroies the entity attached to the puck.
+//
+
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+/* global Xform */
+Script.include("/~/system/libraries/Xform.js");
+
+(function() { // BEGIN LOCAL_SCOPE
+
+var TABLET_BUTTON_NAME = "PUCKTACH";
+var HTML_URL = "https://s3.amazonaws.com/hifi-public/tony/html/puck-attach.html";
+
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+var tabletButton = tablet.addButton({
+    text: TABLET_BUTTON_NAME,
+    icon: "https://s3.amazonaws.com/hifi-public/tony/icons/puck-i.svg",
+    activeIcon: "https://s3.amazonaws.com/hifi-public/tony/icons/puck-a.svg"
+});
+
+tabletButton.clicked.connect(function () {
+    if (shown) {
+        tablet.gotoHomeScreen();
+    } else {
+        tablet.gotoWebScreen(HTML_URL);
+    }
+});
+
+var shown = false;
+var attachedEntity;
+var attachedObj;
+
+function onScreenChanged(type, url) {
+    if (type === "Web" && url === HTML_URL) {
+        tabletButton.editProperties({isActive: true});
+        if (!shown) {
+            // hook up to event bridge
+            tablet.webEventReceived.connect(onWebEventReceived);
+
+            Script.setTimeout(function () {
+                // send available tracked objects to the html running in the tablet.
+                var availableTrackedObjects = getAvailableTrackedObjects();
+                tablet.emitScriptEvent(JSON.stringify(availableTrackedObjects));
+
+                // print("PUCK-ATTACH: availableTrackedObjects = " + JSON.stringify(availableTrackedObjects));
+            }, 1000);  // wait 1 sec before sending..
+        }
+        shown = true;
+    } else {
+        tabletButton.editProperties({isActive: false});
+        if (shown) {
+            // disconnect from event bridge
+            tablet.webEventReceived.disconnect(onWebEventReceived);
+        }
+        shown = false;
+    }
+}
+
+tablet.screenChanged.connect(onScreenChanged);
+
+function indexToTrackedObjectName(index) {
+    return "TrackedObject" + pad(index, 2);
+}
+
+function getAvailableTrackedObjects() {
+    var available = [];
+    var NUM_TRACKED_OBJECTS = 16;
+    var i;
+    for (i = 0; i < NUM_TRACKED_OBJECTS; i++) {
+        var key = indexToTrackedObjectName(i);
+        var pose = Controller.getPoseValue(Controller.Hardware.Vive[key]);
+        if (pose && pose.valid) {
+            available.push(i);
+        }
+    }
+    return available;
+}
+
+function attach(obj) {
+    attachedEntity = Entities.addEntity({
+        type: "Model",
+        name: "puck-attach-entity",
+        modelURL: obj.modelurl
+    });
+    attachedObj = obj;
+    var localPos = {x: Number(obj.posx), y: Number(obj.posy), z: Number(obj.posz)};
+    var localRot = Quat.fromVec3Degrees({x: Number(obj.rotx), y: Number(obj.roty), z: Number(obj.rotz)});
+    attachedObj.localXform = new Xform(localRot, localPos);
+    var key = indexToTrackedObjectName(Number(attachedObj.puckno));
+    attachedObj.key = key;
+
+    // print("PUCK-ATTACH: attachedObj = " + JSON.stringify(attachedObj));
+
+    Script.update.connect(update);
+    update();
+}
+
+function remove() {
+    if (attachedEntity) {
+        Script.update.disconnect(update);
+        Entities.deleteEntity(attachedEntity);
+        attachedEntity = undefined;
+    }
+    attachedObj = undefined;
+}
+
+function pad(num, size) {
+    var tempString = "000000000" + num;
+    return tempString.substr(tempString.length - size);
+}
+
+function update() {
+    if (attachedEntity && attachedObj && Controller.Hardware.Vive) {
+        var pose = Controller.getPoseValue(Controller.Hardware.Vive[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));
+        if (pose && pose.valid) {
+            Entities.editEntity(attachedEntity, {
+                position: finalXform.pos,
+                rotation: finalXform.rot
+            });
+        } else {
+            if (pose) {
+                print("PUCK-ATTACH: WARNING: invalid pose for " + attachedObj.key);
+            } else {
+                print("PUCK-ATTACH: WARNING: could not find key " + attachedObj.key);
+            }
+        }
+    }
+}
+
+function onWebEventReceived(msg) {
+    var obj = {};
+    try {
+        obj = JSON.parse(msg);
+    } catch (err) {
+        return;
+    }
+    if (obj.cmd === "attach") {
+        remove();
+        attach(obj);
+    } else if (obj.cmd === "detach") {
+        remove();
+    }
+}
+
+Script.scriptEnding.connect(function () {
+    remove();
+    tablet.removeButton(tabletButton);
+    if (shown) {
+        tablet.webEventReceived.disconnect(onWebEventReceived);
+        tablet.gotoHomeScreen();
+    }
+    tablet.screenChanged.disconnect(onScreenChanged);
+});
+
+}()); // END LOCAL_SCOPE
diff --git a/scripts/system/assets/sounds/countdown-tick.wav b/scripts/system/assets/sounds/countdown-tick.wav
new file mode 100644
index 0000000000..015e1f642e
Binary files /dev/null and b/scripts/system/assets/sounds/countdown-tick.wav differ
diff --git a/scripts/system/assets/sounds/finish-recording.wav b/scripts/system/assets/sounds/finish-recording.wav
new file mode 100644
index 0000000000..f224049f97
Binary files /dev/null and b/scripts/system/assets/sounds/finish-recording.wav differ
diff --git a/scripts/system/assets/sounds/start-recording.wav b/scripts/system/assets/sounds/start-recording.wav
new file mode 100644
index 0000000000..71c69f3372
Binary files /dev/null and b/scripts/system/assets/sounds/start-recording.wav differ
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index f7ea4b8f8a..2c81622668 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -479,7 +479,8 @@ function populateNearbyUserList(selectData, oldAudioData) {
             admin: false,
             personalMute: !!id && Users.getPersonalMuteStatus(id), // expects proper boolean, not null
             ignore: !!id && Users.getIgnoreStatus(id), // ditto
-            isPresent: true
+            isPresent: true,
+            isReplicated: avatar.isReplicated
         };
         if (id) {
             addAvatarNode(id); // No overlay for ourselves
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index c60e3a67f7..37618253ee 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -384,7 +384,6 @@ function onButtonClicked() {
     } else {
         fillImageDataFromPrevious();
         tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
-        tablet.webEventReceived.connect(onMessage);
         HMD.openTablet();
     }
 }
@@ -504,8 +503,9 @@ function takeSnapshot() {
             Window.takeSnapshot(false, includeAnimated, 1.91);
         }, SNAPSHOT_DELAY);
     }, FINISH_SOUND_DELAY);
+    UserActivityLogger.logAction("snaphshot_taken", { location: location.href });
 }
-
+    
 function isDomainOpen(id, callback) {
     print("Checking open status of domain with ID:", id);
     var status = false;
@@ -659,10 +659,15 @@ function maybeDeleteSnapshotStories() {
     storyIDsToMaybeDelete = [];
 }
 function onTabletScreenChanged(type, url) {
+    var wasInSnapshotReview = isInSnapshotReview; 
     isInSnapshotReview = (type === "Web" && url === SNAPSHOT_REVIEW_URL);
     button.editProperties({ isActive: isInSnapshotReview });
-    if (!isInSnapshotReview) {
-        tablet.webEventReceived.disconnect(onMessage);
+    if (isInSnapshotReview !== wasInSnapshotReview) {
+        if (isInSnapshotReview) {
+            tablet.webEventReceived.connect(onMessage);
+        } else {
+            tablet.webEventReceived.disconnect(onMessage);
+        }
     }
 }
 function onUsernameChanged() {
diff --git a/tests/controllers/CMakeLists.txt b/tests/controllers/CMakeLists.txt
index 3aac4db0a8..3221070837 100644
--- a/tests/controllers/CMakeLists.txt
+++ b/tests/controllers/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME controllers-test)
 setup_hifi_project(Script Qml)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(shared gl script-engine plugins render-utils ui-plugins input-plugins display-plugins controllers)
 
@@ -16,4 +18,4 @@ if (WIN32)
     target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
 endif()
 
-package_libraries_for_deployment()
\ No newline at end of file
+package_libraries_for_deployment()
diff --git a/tests/entities/CMakeLists.txt b/tests/entities/CMakeLists.txt
index 448ea83956..080ae7cdd9 100644
--- a/tests/entities/CMakeLists.txt
+++ b/tests/entities/CMakeLists.txt
@@ -3,7 +3,7 @@ set(TARGET_NAME "entities-test")
 
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Network Script)
-
+setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
 # link in the shared libraries
diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt
index c37e36b53b..d73d7a111d 100644
--- a/tests/gpu-test/CMakeLists.txt
+++ b/tests/gpu-test/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TARGET_NAME gpu-test)
 AUTOSCRIBE_SHADER_LIB(gpu model render-utils)
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL Script Widgets)
+setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(networking gl gpu gpu-gl procedural shared fbx model model-networking animation script-engine render render-utils octree image ktx)
 package_libraries_for_deployment()
diff --git a/tests/qt59/CMakeLists.txt b/tests/qt59/CMakeLists.txt
index 32cc125ecf..e0e8138a1e 100644
--- a/tests/qt59/CMakeLists.txt
+++ b/tests/qt59/CMakeLists.txt
@@ -1,10 +1,12 @@
 
 set(TARGET_NAME qt59)
- 
+
 if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Gui)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/recording/CMakeLists.txt b/tests/recording/CMakeLists.txt
index 4e881fcbd9..b5b1e6a54e 100644
--- a/tests/recording/CMakeLists.txt
+++ b/tests/recording/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TARGET_NAME recording-test)
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Test)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
+setup_memory_debugger()
 link_hifi_libraries(shared recording)
 package_libraries_for_deployment()
 
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index a8e4ab286c..b6989a57b7 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -5,6 +5,8 @@ if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp
index d47821ab1c..9c4e3ae870 100644
--- a/tests/render-perf/src/main.cpp
+++ b/tests/render-perf/src/main.cpp
@@ -47,6 +47,7 @@
 #include <gpu/gl/GLTexture.h>
 #include <gpu/StandardShaderLib.h>
 
+#include <AnimationCache.h>
 #include <SimpleEntitySimulation.h>
 #include <EntityDynamicInterface.h>
 #include <EntityDynamicFactoryInterface.h>
diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt
index 1f0c0a069a..30030914ab 100644
--- a/tests/render-texture-load/CMakeLists.txt
+++ b/tests/render-texture-load/CMakeLists.txt
@@ -5,6 +5,8 @@ if (WIN32)
   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
 endif()
 
+setup_memory_debugger()
+
 # This is not a testcase -- just set it up as a regular hifi project
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt
index 5ec6a28b5c..4944ad2cbc 100644
--- a/tests/render-utils/CMakeLists.txt
+++ b/tests/render-utils/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME render-utils-test)
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(render-utils gl gpu gpu-gl shared)
 target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index 5b38f473e8..bab1e0dcdc 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -5,6 +5,8 @@ set(TARGET_NAME shaders-test)
 setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
+setup_memory_debugger()
+
 # link in the shared libraries
 link_hifi_libraries(shared octree gl gpu gpu-gl model render fbx networking entities 
                     script-engine physics 
diff --git a/tools/ac-client/CMakeLists.txt b/tools/ac-client/CMakeLists.txt
index 9e623b02e9..24eeadba9c 100644
--- a/tools/ac-client/CMakeLists.txt
+++ b/tools/ac-client/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME ac-client)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/atp-get/CMakeLists.txt b/tools/atp-get/CMakeLists.txt
index b1646dc023..75f92b787d 100644
--- a/tools/atp-get/CMakeLists.txt
+++ b/tools/atp-get/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME atp-get)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/avatar-json-to-dot.js b/tools/avatar-json-to-dot.js
new file mode 100644
index 0000000000..fcd75a99c1
--- /dev/null
+++ b/tools/avatar-json-to-dot.js
@@ -0,0 +1,27 @@
+// usage:
+//   node avatar-json-to-dot.js /path/to/avatar-animaton.json > out.dot
+//
+// Then if you have graphviz installed you can run the following command to generate a png.
+//   dot -Tpng out.dot > out.png
+
+var fs = require('fs');
+var filename = process.argv[2];
+
+function dumpNodes(node) {
+    node.children.forEach(function (child) {
+        console.log('    ' + node.id + ' -> ' + child.id + ';');
+        dumpNodes(child);
+    });
+}
+
+fs.readFile(filename, 'utf8', function (err, data) {
+    if (err) {
+        console.log('error opening ' + filename + ', err = ' + err);
+    } else {
+        var graph = JSON.parse(data);
+        console.log('digraph graphname {');
+        console.log('    rankdir = "LR";');
+        dumpNodes(graph.root);
+        console.log('}');
+    }
+});
diff --git a/tools/ice-client/CMakeLists.txt b/tools/ice-client/CMakeLists.txt
index a80145974c..ae42d79f7e 100644
--- a/tools/ice-client/CMakeLists.txt
+++ b/tools/ice-client/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME ice-client)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/skeleton-dump/CMakeLists.txt b/tools/skeleton-dump/CMakeLists.txt
index 04d450d9c2..bb2fe24f51 100644
--- a/tools/skeleton-dump/CMakeLists.txt
+++ b/tools/skeleton-dump/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(TARGET_NAME skeleton-dump)
 setup_hifi_project(Core Widgets)
+setup_memory_debugger()
 link_hifi_libraries(shared fbx model gpu gl animation)
 
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index 810d13ffd7..c28aa9efa4 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -8,6 +8,8 @@ find_package(VHACD REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
 
+setup_memory_debugger()
+
 if (UNIX AND NOT APPLE)
   include(FindOpenMP)
   if(OPENMP_FOUND)
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
new file mode 100644
index 0000000000..4617cf47b6
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
@@ -0,0 +1,134 @@
+//  doppleganger-app.js
+//
+//  Created by Timothy Dedischew on 04/21/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  This Client script creates an instance of a Doppleganger that can be toggled on/off via tablet button.
+//  (for more info see doppleganger.js)
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+var require = Script.require;
+
+var WANT_DEBUG = false;
+
+var DopplegangerClass = require('./doppleganger.js'),
+    DopplegangerAttachments = require('./doppleganger-attachments.js'),
+    modelHelper = require('./model-helper.js').modelHelper;
+
+var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
+    button = tablet.addButton({
+        icon: Script.resolvePath('./doppleganger-i.svg'),
+        activeIcon: Script.resolvePath('./doppleganger-a.svg'),
+        text: 'MIRROR'
+    });
+
+Script.scriptEnding.connect(function() {
+    tablet.removeButton(button);
+    button = null;
+});
+
+var doppleganger = new DopplegangerClass({
+    avatar: MyAvatar,
+    mirrored: false,
+    autoUpdate: true,
+    type: 'overlay'
+});
+
+// add support for displaying regular (non-soft) attachments on the doppleganger
+{
+    var RECHECK_ATTACHMENT_MS = 1000;
+    var dopplegangerAttachments = new DopplegangerAttachments(doppleganger),
+        attachmentInterval = null,
+        lastHash = dopplegangerAttachments.getAttachmentsHash();
+
+    // monitor for attachment changes, but only when the doppleganger is active
+    doppleganger.activeChanged.connect(function(active, reason) {
+        if (attachmentInterval) {
+            Script.clearInterval(attachmentInterval);
+        }
+        if (active) {
+            attachmentInterval = Script.setInterval(checkAttachmentsHash, RECHECK_ATTACHMENT_MS);
+        } else {
+            attachmentInterval = null;
+        }
+    });
+    function checkAttachmentsHash() {
+        var currentHash = dopplegangerAttachments.getAttachmentsHash();
+        if (currentHash !== lastHash) {
+            lastHash = currentHash;
+            debugPrint('app-doppleganger | detect attachment change');
+            dopplegangerAttachments.refreshAttachments();
+        }
+    }
+}
+
+// hide the doppleganger if this client script is unloaded
+Script.scriptEnding.connect(doppleganger, 'stop');
+
+// hide the doppleganger if the user switches domains (which might place them arbitrarily far away in world space)
+function onDomainChanged() {
+    if (doppleganger.active) {
+        doppleganger.stop('domain_changed');
+    }
+}
+Window.domainChanged.connect(onDomainChanged);
+Window.domainConnectionRefused.connect(onDomainChanged);
+Script.scriptEnding.connect(function() {
+    Window.domainChanged.disconnect(onDomainChanged);
+    Window.domainConnectionRefused.disconnect(onDomainChanged);
+});
+
+// toggle on/off via tablet button
+button.clicked.connect(doppleganger, 'toggle');
+
+// highlight tablet button based on current doppleganger state
+doppleganger.activeChanged.connect(function(active, reason) {
+    if (button) {
+        button.editProperties({ isActive: active });
+        debugPrint('doppleganger.activeChanged', active, reason);
+    }
+});
+
+// alert the user if there was an error applying their skeletonModelURL
+doppleganger.modelLoaded.connect(function(error, result) {
+    if (doppleganger.active && error) {
+        Window.alert('doppleganger | ' + error + '\n' + doppleganger.skeletonModelURL);
+    }
+});
+
+// ----------------------------------------------------------------------------
+
+// add debug indicators, but only if the user has configured the settings value
+if (Settings.getValue('debug.doppleganger', false)) {
+    WANT_DEBUG = true;
+    DopplegangerClass.addDebugControls(doppleganger);
+}
+
+function debugPrint() {
+    if (WANT_DEBUG) {
+        print('app-doppleganger | ' + [].slice.call(arguments).join(' '));
+    }
+}
+// ----------------------------------------------------------------------------
+
+UserActivityLogger.logAction('doppleganger_app_load');
+doppleganger.activeChanged.connect(function(active, reason) {
+    if (active) {
+        UserActivityLogger.logAction('doppleganger_enable');
+    } else {
+        if (reason === 'stop') {
+            // user intentionally toggled the doppleganger
+            UserActivityLogger.logAction('doppleganger_disable');
+        } else {
+            debugPrint('doppleganger stopped:', reason);
+            UserActivityLogger.logAction('doppleganger_autodisable', { reason: reason });
+        }
+    }
+});
+dopplegangerAttachments.attachmentsUpdated.connect(function(attachments) {
+    UserActivityLogger.logAction('doppleganger_attachments', { count: attachments.length });
+});
+
diff --git a/interface/resources/icons/tablet-icons/doppleganger-a.svg b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-a.svg
similarity index 100%
rename from interface/resources/icons/tablet-icons/doppleganger-a.svg
rename to unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-a.svg
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js
new file mode 100644
index 0000000000..a3b3873c2d
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js
@@ -0,0 +1,238 @@
+"use strict";
+/* eslint-env commonjs */
+/* eslint-disable comma-dangle */
+
+module.exports = DopplegangerAttachments;
+
+DopplegangerAttachments.version = '0.0.0';
+DopplegangerAttachments.WANT_DEBUG = false;
+
+var _modelHelper = require('./model-helper.js'),
+    modelHelper = _modelHelper.modelHelper,
+    ModelReadyWatcher = _modelHelper.ModelReadyWatcher,
+    utils = require('./utils.js');
+
+function log() {
+    print('doppleganger-attachments | ' + [].slice.call(arguments).join(' '));
+}
+
+function debugPrint() {
+    DopplegangerAttachments.WANT_DEBUG && log.apply(this, arguments);
+}
+
+function DopplegangerAttachments(doppleganger, options) {
+    utils.assign(this, {
+        _options: options,
+        doppleganger: doppleganger,
+        attachments: undefined,
+        manualJointSync: true,
+        attachmentsUpdated: utils.signal(function attachmentsUpdated(currentAttachments, previousAttachments){}),
+    });
+    this._initialize();
+    debugPrint('DopplegangerAttachments...', JSON.stringify(options));
+}
+DopplegangerAttachments.prototype = {
+    // "hash" the current attachments (so that changes can be detected)
+    getAttachmentsHash: function() {
+        return JSON.stringify(this.doppleganger.avatar.getAttachmentsVariant());
+    },
+    // create a pure Object copy of the current native attachments variant
+    _cloneAttachmentsVariant: function() {
+        return JSON.parse(JSON.stringify(this.doppleganger.avatar.getAttachmentsVariant()));
+    },
+    // fetch and resolve attachments to include jointIndex and other relevant $metadata
+    _getResolvedAttachments: function() {
+        var attachments = this._cloneAttachmentsVariant(),
+            objectID = this.doppleganger.objectID;
+        function toString() {
+            return '[attachment #' + this.$index + ' ' + this.$path + ' @ ' + this.jointName + '{' + this.$jointIndex + '}]';
+        }
+        return attachments.map(function(attachment, i) {
+            var jointIndex = modelHelper.getJointIndex(objectID, attachment.jointName),
+                path = (attachment.modelUrl+'').split(/[?#]/)[0].split('/').slice(-3).join('/');
+            return Object.defineProperties(attachment, {
+                $hash: { value: JSON.stringify(attachment) },
+                $index: { value: i },
+                $jointIndex: { value: jointIndex },
+                $path: { value: path },
+                toString: { value: toString },
+            });
+        });
+    },
+    // compare before / after attachment sets to determine which ones need to be (re)created
+    refreshAttachments: function() {
+        var before = this.attachments || [],
+            beforeIndex = before.reduce(function(out, att, index) {
+                out[att.$hash] = index; return out;
+            }, {});
+        var after = this._getResolvedAttachments(),
+            afterIndex = after.reduce(function(out, att, index) {
+                out[att.$hash] = index; return out;
+            }, {});
+
+        Object.keys(beforeIndex).concat(Object.keys(afterIndex)).forEach(function(hash) {
+            if (hash in beforeIndex && hash in afterIndex) {
+                // print('reusing previous attachment', hash);
+                after[afterIndex[hash]] = before[beforeIndex[hash]];
+            } else if (!(hash in afterIndex)) {
+                var attachment = before[beforeIndex[hash]];
+                attachment.properties && attachment.properties.objectID &&
+                    modelHelper.deleteObject(attachment.properties.objectID);
+                delete attachment.properties;
+            }
+        });
+        this.attachments = after;
+        this._createAttachmentObjects();
+        this.attachmentsUpdated(after, before);
+    },
+    _createAttachmentObjects: function() {
+        try {
+            var attachments = this.attachments,
+                parentID = this.doppleganger.objectID,
+                jointNames = this.doppleganger.jointNames,
+                properties = modelHelper.getProperties(this.doppleganger.objectID);
+
+            debugPrint('DopplegangerAttachments..._createAttachmentObjects', JSON.stringify({
+                type: properties.type,
+                attachments: attachments.length,
+                parentID: parentID,
+                jointNames: jointNames.join(' | '),
+            },0,2));
+            return attachments.map(utils.bind(this, function(attachment, i) {
+                var type = modelHelper.type(attachment.properties && attachment.properties.objectID);
+                if (type === 'overlay') {
+                    debugPrint('skipping already-provisioned attachment object', type, attachment.properties && attachment.properties.name);
+                    return attachment;
+                }
+                var jointIndex = attachment.$jointIndex, // jointNames.indexOf(attachment.jointName),
+                    scale = this.doppleganger.avatar.scale * (attachment.scale||1.0);
+
+                attachment.properties = utils.assign({
+                    name: attachment.toString(),
+                    type: properties.type,
+                    modelURL: attachment.modelUrl,
+                    scale: scale,
+                    dimensions: modelHelper.type(parentID) === 'entity' ?
+                        Vec3.multiply(attachment.scale||1.0, Vec3.ONE) : undefined,
+                    visible: false,
+                    collisionless: true,
+                    dynamic: false,
+                    shapeType: 'none',
+                    lifetime: 60,
+                    grabbable: true,
+                }, !this.manualJointSync && {
+                    parentID: parentID,
+                    parentJointIndex: jointIndex,
+                });
+                var objectID = attachment.properties.objectID = modelHelper.addObject(attachment.properties);
+                attachment._resource = ModelCache.prefetch(attachment.properties.modelURL);
+                attachment._modelReadier = new ModelReadyWatcher( {
+                    resource: attachment._resource,
+                    objectID: objectID,
+                });
+                this.doppleganger.activeChanged.connect(attachment._modelReadier, '_stop');
+
+                attachment._modelReadier.modelReady.connect(this, function(err, result) {
+                    if (err) {
+                        log('>>>>> modelReady ERROR <<<<<: ' + err, attachment.modelUrl);
+                        modelHelper.deleteObject(objectID);
+                        return objectID = null;
+                    }
+                    debugPrint('attachment model ('+modelHelper.type(result.objectID)+') is ready; # joints ==',
+                        result.jointNames && result.jointNames.length, result.naturalDimensions, result.objectID);
+                    var properties = modelHelper.getProperties(result.objectID),
+                        naturalDimensions = attachment.properties.naturalDimensions = properties.naturalDimensions;
+                    modelHelper.editObject(result.objectID, {
+                        dimensions: naturalDimensions ? Vec3.multiply(attachment.scale, naturalDimensions) : undefined,
+                    });
+                    this.onJointsUpdated(parentID); // trigger once to initialize position/rotation
+                    // give time for model overlay to "settle", then make it visible
+                    Script.setTimeout(utils.bind(this, function() {
+                        modelHelper.editObject(result.objectID, {
+                            visible: true,
+                        });
+                        attachment._loaded = true;
+                    }), 100);
+                });
+                return attachment;
+            }));
+        } catch (e) {
+            log('_createAttachmentObjects ERROR:', e.stack || e, e.fileName, e.lineNumber);
+        }
+    },
+
+    _removeAttachmentObjects: function() {
+        if (this.attachments) {
+            this.attachments.forEach(function(attachment) {
+                if (attachment.properties) {
+                    if (attachment.properties.objectID) {
+                        modelHelper.deleteObject(attachment.properties.objectID);
+                    }
+                    delete attachment.properties.objectID;
+                }
+            });
+            delete this.attachments;
+        }
+    },
+
+    onJointsUpdated: function onJointsUpdated(objectID) {
+        var jointOrientations = modelHelper.getJointOrientations(objectID),
+            jointPositions = modelHelper.getJointPositions(objectID),
+            parentID = objectID,
+            avatarScale = this.doppleganger.scale,
+            manualJointSync = this.manualJointSync;
+
+        if (!this.attachments) {
+            this.refreshAttachments();
+        }
+        var updatedObjects = this.attachments.reduce(function(updates, attachment, i) {
+            if (!attachment.properties || !attachment._loaded) {
+                return updates;
+            }
+            var objectID = attachment.properties.objectID,
+                jointIndex = attachment.$jointIndex,
+                jointOrientation = jointOrientations[jointIndex],
+                jointPosition = jointPositions[jointIndex];
+
+            var translation = Vec3.multiply(avatarScale, attachment.translation),
+                rotation = Quat.fromVec3Degrees(attachment.rotation),
+                localPosition = Vec3.multiplyQbyV(jointOrientation, translation),
+                localRotation = rotation;
+
+            updates[objectID] = manualJointSync ? {
+                visible: true,
+                position: Vec3.sum(jointPosition, localPosition),
+                rotation: Quat.multiply(jointOrientation, localRotation),
+                scale: avatarScale * attachment.scale,
+            } : {
+                visible: true,
+                parentID: parentID,
+                parentJointIndex: jointIndex,
+                localRotation: localRotation,
+                localPosition: localPosition,
+                scale: attachment.scale,
+            };
+            onJointsUpdated[objectID] = updates[objectID];
+            return updates;
+        }, {});
+        modelHelper.editObjects(updatedObjects);
+    },
+
+    _initialize: function() {
+        var doppleganger = this.doppleganger;
+        if ('$attachmentControls' in doppleganger) {
+            throw new Error('only one set of debug controls can be added per doppleganger');
+        }
+        doppleganger.$attachmentControls = this;
+        doppleganger.activeChanged.connect(this, function(active) {
+            if (active) {
+                doppleganger.jointsUpdated.connect(this, 'onJointsUpdated');
+            } else {
+                doppleganger.jointsUpdated.disconnect(this, 'onJointsUpdated');
+                this._removeAttachmentObjects();
+            }
+        });
+
+        Script.scriptEnding.connect(this, '_removeAttachmentObjects');
+    },
+};
diff --git a/interface/resources/icons/tablet-icons/doppleganger-i.svg b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-i.svg
similarity index 100%
rename from interface/resources/icons/tablet-icons/doppleganger-i.svg
rename to unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-i.svg
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
new file mode 100644
index 0000000000..bebd36df45
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
@@ -0,0 +1,515 @@
+"use strict";
+
+//  doppleganger.js
+//
+//  Created by Timothy Dedischew on 04/21/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* eslint-env commonjs */
+// @module doppleganger
+//
+// This module contains the `Doppleganger` class implementation for creating an inspectable replica of
+// an Avatar (as a model directly in front of and facing them).  Joint positions and rotations are copied
+// over in an update thread, so that the model automatically mirrors the Avatar's joint movements.
+// An Avatar can then for example walk around "themselves" and examine from the back, etc.
+//
+// This should be helpful for inspecting your own look and debugging avatars, etc.
+//
+// The doppleganger is created as an overlay so that others do not see it -- and this also allows for the
+// highest possible update rate when keeping joint data in sync.
+
+module.exports = Doppleganger;
+
+var _modelHelper = require('./model-helper.js'),
+    modelHelper = _modelHelper.modelHelper,
+    ModelReadyWatcher = _modelHelper.ModelReadyWatcher;
+
+// @property {bool} - toggle verbose debug logging on/off
+Doppleganger.WANT_DEBUG = false;
+
+// @property {bool} - when set true, Script.update will be used instead of setInterval for syncing joint data
+Doppleganger.USE_SCRIPT_UPDATE = false;
+
+// @property {int} - the frame rate to target when using setInterval for joint updates
+Doppleganger.TARGET_FPS = 60;
+
+// @class Doppleganger - Creates a new instance of a Doppleganger.
+// @param {Avatar} [options.avatar=MyAvatar] - Avatar used to retrieve position and joint data.
+// @param {bool}   [options.mirrored=true]   - Apply "symmetric mirroring" of Left/Right joints.
+// @param {bool}   [options.autoUpdate=true] - Automatically sync joint data.
+function Doppleganger(options) {
+    this.options = options = options || {};
+    this.avatar = options.avatar || MyAvatar;
+    this.mirrored = 'mirrored' in options ? options.mirrored : true;
+    this.autoUpdate = 'autoUpdate' in options ? options.autoUpdate : true;
+
+    // @public
+    this.active = false;   // whether doppleganger is currently being displayed/updated
+    this.objectID = null; // current doppleganger's Overlay or Entity id
+    this.frame = 0;        // current joint update frame
+
+    // @signal - emitted when .active state changes
+    this.activeChanged = signal(function(active, reason) {});
+    // @signal - emitted once model is either loaded or errors out
+    this.modelLoaded = signal(function(error, result){});
+    // @signal - emitted each time the model's joint data has been synchronized
+    this.jointsUpdated = signal(function(objectID){});
+}
+
+Doppleganger.prototype = {
+    // @public @method - toggles doppleganger on/off
+    toggle: function() {
+        if (this.active) {
+            debugPrint('toggling off');
+            this.stop();
+        } else {
+            debugPrint('toggling on');
+            this.start();
+        }
+        return this.active;
+    },
+
+    // @public @method - synchronize the joint data between Avatar / doppleganger
+    update: function() {
+        this.frame++;
+        try {
+            if (!this.objectID) {
+                throw new Error('!this.objectID');
+            }
+
+            if (this.avatar.skeletonModelURL !== this.skeletonModelURL) {
+                return this.stop('avatar_changed');
+            }
+
+            var rotations = this.avatar.getJointRotations();
+            var translations = this.avatar.getJointTranslations();
+            var size = rotations.length;
+
+            // note: this mismatch can happen when the avatar's model is actively changing
+            if (size !== translations.length ||
+                (this.jointStateCount && size !== this.jointStateCount)) {
+                debugPrint('mismatched joint counts (avatar model likely changed)', size, translations.length, this.jointStateCount);
+                this.stop('avatar_changed_joints');
+                return;
+            }
+            this.jointStateCount = size;
+
+            if (this.mirrored) {
+                var mirroredIndexes = this.mirroredIndexes;
+                var outRotations = new Array(size);
+                var outTranslations = new Array(size);
+                for (var i=0; i < size; i++) {
+                    var index = mirroredIndexes[i];
+                    if (index < 0 || index === false) {
+                        index = i;
+                    }
+                    var rot = rotations[index];
+                    var trans = translations[index];
+                    trans.x *= -1;
+                    rot.y *= -1;
+                    rot.z *= -1;
+                    outRotations[i] = rot;
+                    outTranslations[i] = trans;
+                }
+                rotations = outRotations;
+                translations = outTranslations;
+            }
+            modelHelper.editObject(this.objectID, {
+                jointRotations: rotations,
+                jointTranslations: translations
+            });
+            this.jointsUpdated(this.objectID);
+        } catch (e) {
+            log('.update error: '+ e, index, e.stack);
+            this.stop('update_error');
+            throw e;
+        }
+    },
+
+    // @public @method - show the doppleganger (and start the update thread, if options.autoUpdate was specified).
+    // @param {vec3} [options.position=(in front of avatar)] - starting position
+    // @param {quat} [options.orientation=avatar.orientation] - starting orientation
+    start: function(options) {
+        options = assign(this.options, options);
+        if (this.objectID) {
+            log('start() called but object model already exists', this.objectID);
+            return;
+        }
+        var avatar = this.avatar;
+        if (!avatar.jointNames.length) {
+            return this.stop('joints_unavailable');
+        }
+
+        this.frame = 0;
+        var localPosition = Vec3.multiply(2, Quat.getForward(avatar.orientation));
+        this.position = options.position || Vec3.sum(avatar.position, localPosition);
+        this.orientation = options.orientation || avatar.orientation;
+        this.skeletonModelURL = avatar.skeletonModelURL;
+        this.scale = avatar.scale || 1.0;
+        this.jointStateCount = 0;
+        this.jointNames = avatar.jointNames;
+        this.type = options.type || 'overlay';
+        this.mirroredNames = modelHelper.deriveMirroredJointNames(this.jointNames);
+        this.mirroredIndexes = this.mirroredNames.map(function(name) {
+            return name ? avatar.getJointIndex(name) : false;
+        });
+
+        this.objectID = modelHelper.addObject({
+            type: this.type === 'overlay' ? 'model' : 'Model',
+            modelURL: this.skeletonModelURL,
+            position: this.position,
+            rotation: this.orientation,
+            scale: this.scale
+        });
+        Script.scriptEnding.connect(this, function() {
+            modelHelper.deleteObject(this.objectID);
+        });
+        debugPrint('doppleganger created; objectID =', this.objectID);
+
+        // trigger clean up (and stop updates) if the object gets deleted
+        this.onObjectDeleted = function(uuid) {
+            if (uuid === this.objectID) {
+                log('onObjectDeleted', uuid);
+                this.stop('object_deleted');
+            }
+        };
+        modelHelper.objectDeleted.connect(this, 'onObjectDeleted');
+
+        if ('onLoadComplete' in avatar) {
+            // stop the current doppleganger if Avatar loads a different model URL
+            this.onLoadComplete = function() {
+                if (avatar.skeletonModelURL !== this.skeletonModelURL) {
+                    this.stop('avatar_changed_load');
+                }
+            };
+            avatar.onLoadComplete.connect(this, 'onLoadComplete');
+        }
+
+        this.onModelLoaded = function(error, result) {
+            if (error) {
+                return this.stop(error);
+            }
+            debugPrint('model ('+modelHelper.type(this.objectID)+')' + ' is ready; # joints == ' + result.jointNames.length);
+            var naturalDimensions = modelHelper.getProperties(this.objectID, ['naturalDimensions']).naturalDimensions;
+            debugPrint('naturalDimensions:', JSON.stringify(naturalDimensions));
+            var props = { visible: true };
+            if (naturalDimensions) {
+                props.dimensions = Vec3.multiply(this.scale, naturalDimensions);
+            }
+            debugPrint('scaledDimensions:', this.scale, JSON.stringify(props.dimensions));
+            modelHelper.editObject(this.objectID, props);
+            if (!options.position) {
+                this.syncVerticalPosition();
+            }
+            if (this.autoUpdate) {
+                this._createUpdateThread();
+            }
+        };
+
+        this._resource = ModelCache.prefetch(this.skeletonModelURL);
+        this._modelReadier = new ModelReadyWatcher({
+            resource: this._resource,
+            objectID: this.objectID
+        });
+        this._modelReadier.modelReady.connect(this, 'onModelLoaded');
+        this.activeChanged(this.active = true, 'start');
+    },
+
+    // @public @method - hide the doppleganger
+    // @param {String} [reason=stop] - the reason stop was called
+    stop: function(reason) {
+        reason = reason || 'stop';
+        if (this.onUpdate) {
+            Script.update.disconnect(this, 'onUpdate');
+            delete this.onUpdate;
+        }
+        if (this._interval) {
+            Script.clearInterval(this._interval);
+            this._interval = undefined;
+        }
+        if (this.onObjectDeleted) {
+            modelHelper.objectDeleted.disconnect(this, 'onObjectDeleted');
+            delete this.onObjectDeleted;
+        }
+        if (this.onLoadComplete) {
+            this.avatar.onLoadComplete.disconnect(this, 'onLoadComplete');
+            delete this.onLoadComplete;
+        }
+        if (this.onModelLoaded) {
+            this._modelReadier && this._modelReadier.modelReady.disconnect(this, 'onModelLoaded');
+            this._modelReadier = this.onModelLoaded = undefined;
+        }
+        if (this.objectID) {
+            modelHelper.deleteObject(this.objectID);
+            this.objectID = undefined;
+        }
+        if (this.active) {
+            this.activeChanged(this.active = false, reason);
+        } else if (reason) {
+            debugPrint('already stopped so not triggering another activeChanged; latest reason was:', reason);
+        }
+    },
+    // @public @method - Reposition the doppleganger so it sees "eye to eye" with the Avatar.
+    // @param {String} [byJointName=Hips] - the reference joint used to align the Doppleganger and Avatar
+    syncVerticalPosition: function(byJointName) {
+        byJointName = byJointName || 'Hips';
+        var positions = modelHelper.getJointPositions(this.objectID),
+            properties = modelHelper.getProperties(this.objectID),
+            dopplePosition = properties.position,
+            doppleJointIndex = modelHelper.getJointIndex(this.objectID, byJointName),// names.indexOf(byJointName),
+            doppleJointPosition = positions[doppleJointIndex];
+
+        debugPrint('........... doppleJointPosition', JSON.stringify({
+            byJointName: byJointName,
+            dopplePosition: dopplePosition,
+            doppleJointIndex: doppleJointIndex,
+            doppleJointPosition: doppleJointPosition,
+            properties: properties.type,
+            positions: positions[0]
+        },0,2));
+        var avatarPosition = this.avatar.position,
+            avatarJointIndex = this.avatar.getJointIndex(byJointName),
+            avatarJointPosition = this.avatar.getJointPosition(avatarJointIndex);
+
+        var offset = (avatarJointPosition.y - doppleJointPosition.y);
+        debugPrint('adjusting for offset', offset);
+        if (properties.type === 'model') {
+            dopplePosition.y = avatarPosition.y + offset;
+        } else {
+            dopplePosition.y = avatarPosition.y - offset;
+        }
+
+        this.position = dopplePosition;
+        modelHelper.editObject(this.objectID, { position: this.position });
+    },
+
+    // @private @method - creates the update thread to synchronize joint data
+    _createUpdateThread: function() {
+        if (Doppleganger.USE_SCRIPT_UPDATE) {
+            debugPrint('creating Script.update thread');
+            this.onUpdate = this.update;
+            Script.update.connect(this, 'onUpdate');
+        } else {
+            debugPrint('creating Script.setInterval thread @ ~', Doppleganger.TARGET_FPS +'fps');
+            var timeout = 1000 / Doppleganger.TARGET_FPS;
+            this._interval = Script.setInterval(bind(this, 'update'), timeout);
+        }
+    }
+
+};
+
+// @function - bind a function to a `this` context
+// @param {Object} - the `this` context
+// @param {Function|String} - function or method name
+function bind(thiz, method) {
+    method = thiz[method] || method;
+    return function() {
+        return method.apply(thiz, arguments);
+    };
+}
+
+// @function - Qt signal polyfill
+function signal(template) {
+    var callbacks = [];
+    return Object.defineProperties(function() {
+        var args = [].slice.call(arguments);
+        callbacks.forEach(function(obj) {
+            obj.handler.apply(obj.scope, args);
+        });
+    }, {
+        connect: { value: function(scope, handler) {
+            var callback = {scope: scope, handler: scope[handler] || handler || scope};
+            if (!callback.handler || !callback.handler.apply) {
+                throw new Error('invalid arguments to connect:' + [template, scope, handler]);
+            }
+            callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
+        }},
+        disconnect: { value: function(scope, handler) {
+            var match = {scope: scope, handler: scope[handler] || handler || scope};
+            callbacks = callbacks.filter(function(obj) {
+                return !(obj.scope === match.scope && obj.handler === match.handler);
+            });
+        }}
+    });
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+/* eslint-disable */
+function assign(target, varArgs) { // .length of function is 2
+    'use strict';
+    if (target == null) { // TypeError if undefined or null
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+
+    var to = Object(target);
+
+    for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+
+        if (nextSource != null) { // Skip over if undefined or null
+            for (var nextKey in nextSource) {
+                // Avoid bugs when hasOwnProperty is shadowed
+                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                    to[nextKey] = nextSource[nextKey];
+                }
+            }
+        }
+    }
+    return to;
+}
+/* eslint-enable */
+// //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+
+// @function - debug logging
+function log() {
+    print('doppleganger | ' + [].slice.call(arguments).join(' '));
+}
+
+function debugPrint() {
+    Doppleganger.WANT_DEBUG && log.apply(this, arguments);
+}
+
+// -- ADVANCED DEBUGGING --
+// @function - Add debug joint indicators / extra debugging info.
+// @param {Doppleganger} - existing Doppleganger instance to add controls to
+//
+// @note:
+//   * rightclick toggles mirror mode on/off
+//   * shift-rightclick toggles the debug indicators on/off
+//   * clicking on an indicator displays the joint name and mirrored joint name in the debug log.
+//
+// Example use:
+//    var doppleganger = new Doppleganger();
+//    Doppleganger.addDebugControls(doppleganger);
+Doppleganger.addDebugControls = function(doppleganger) {
+    DebugControls.COLOR_DEFAULT = { red: 255, blue: 255, green: 255 };
+    DebugControls.COLOR_SELECTED = { red: 0, blue: 255, green: 0 };
+
+    function DebugControls() {
+        this.enableIndicators = true;
+        this.selectedJointName = null;
+        this.debugOverlayIDs = undefined;
+        this.jointSelected = signal(function(result) {});
+    }
+    DebugControls.prototype = {
+        start: function() {
+            if (!this.onMousePressEvent) {
+                this.onMousePressEvent = this._onMousePressEvent;
+                Controller.mousePressEvent.connect(this, 'onMousePressEvent');
+            }
+        },
+
+        stop: function() {
+            this.removeIndicators();
+            if (this.onMousePressEvent) {
+                Controller.mousePressEvent.disconnect(this, 'onMousePressEvent');
+                delete this.onMousePressEvent;
+            }
+        },
+
+        createIndicators: function(jointNames) {
+            this.jointNames = jointNames;
+            return jointNames.map(function(name, i) {
+                return Overlays.addOverlay('shape', {
+                    shape: 'Icosahedron',
+                    scale: 0.1,
+                    solid: false,
+                    alpha: 0.5
+                });
+            });
+        },
+
+        removeIndicators: function() {
+            if (this.debugOverlayIDs) {
+                this.debugOverlayIDs.forEach(Overlays.deleteOverlay);
+                this.debugOverlayIDs = undefined;
+            }
+        },
+
+        onJointsUpdated: function(overlayID) {
+            if (!this.enableIndicators) {
+                return;
+            }
+            var jointNames = Overlays.getProperty(overlayID, 'jointNames'),
+                jointOrientations = Overlays.getProperty(overlayID, 'jointOrientations'),
+                jointPositions = Overlays.getProperty(overlayID, 'jointPositions'),
+                selectedIndex = jointNames.indexOf(this.selectedJointName);
+
+            if (!this.debugOverlayIDs) {
+                this.debugOverlayIDs = this.createIndicators(jointNames);
+            }
+
+            // batch all updates into a single call (using the editOverlays({ id: {props...}, ... }) API)
+            var updatedOverlays = this.debugOverlayIDs.reduce(function(updates, id, i) {
+                updates[id] = {
+                    position: jointPositions[i],
+                    rotation: jointOrientations[i],
+                    color: i === selectedIndex ? DebugControls.COLOR_SELECTED : DebugControls.COLOR_DEFAULT,
+                    solid: i === selectedIndex
+                };
+                return updates;
+            }, {});
+            Overlays.editOverlays(updatedOverlays);
+        },
+
+        _onMousePressEvent: function(evt) {
+            if (!evt.isLeftButton || !this.enableIndicators || !this.debugOverlayIDs) {
+                return;
+            }
+            var ray = Camera.computePickRay(evt.x, evt.y),
+                hit = Overlays.findRayIntersection(ray, true, this.debugOverlayIDs);
+
+            hit.jointIndex = this.debugOverlayIDs.indexOf(hit.overlayID);
+            hit.jointName = this.jointNames[hit.jointIndex];
+            this.jointSelected(hit);
+        }
+    };
+
+    if ('$debugControls' in doppleganger) {
+        throw new Error('only one set of debug controls can be added per doppleganger');
+    }
+    var debugControls = new DebugControls();
+    doppleganger.$debugControls = debugControls;
+
+    function onMousePressEvent(evt) {
+        if (evt.isRightButton) {
+            if (evt.isShifted) {
+                debugControls.enableIndicators = !debugControls.enableIndicators;
+                if (!debugControls.enableIndicators) {
+                    debugControls.removeIndicators();
+                }
+            } else {
+                doppleganger.mirrored = !doppleganger.mirrored;
+            }
+        }
+    }
+
+    doppleganger.activeChanged.connect(function(active) {
+        if (active) {
+            debugControls.start();
+            doppleganger.jointsUpdated.connect(debugControls, 'onJointsUpdated');
+            Controller.mousePressEvent.connect(onMousePressEvent);
+        } else {
+            Controller.mousePressEvent.disconnect(onMousePressEvent);
+            doppleganger.jointsUpdated.disconnect(debugControls, 'onJointsUpdated');
+            debugControls.stop();
+        }
+    });
+
+    debugControls.jointSelected.connect(function(hit) {
+        debugControls.selectedJointName = hit.jointName;
+        if (hit.jointIndex < 0) {
+            return;
+        }
+        hit.mirroredJointName = modelHelper.deriveMirroredJointNames([hit.jointName])[0];
+        log('selected joint:', JSON.stringify(hit, 0, 2));
+    });
+
+    Script.scriptEnding.connect(debugControls, 'removeIndicators');
+
+    return doppleganger;
+};
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js
new file mode 100644
index 0000000000..2dda2c12ec
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js
@@ -0,0 +1,325 @@
+//  model-helper.js
+//
+//  Created by Timothy Dedischew on 06/01/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* eslint-env commonjs */
+// @module model-helper
+//
+// This module provides ModelReadyWatcher (a helper class for knowing when a model becomes usable inworld) and
+// also initial plumbing helpers to eliminate unnecessary API differences when working with Model Overlays and
+// Model Entities at a high-level from scripting.
+
+var utils = require('./utils.js'),
+    assert = utils.assert;
+
+module.exports = {
+    version: '0.0.0',
+    ModelReadyWatcher: ModelReadyWatcher
+};
+
+var _objectDeleted = utils.signal(function objectDeleted(objectID){});
+// proxy for _objectDeleted that only binds deletion tracking if script actually connects to the unified signal
+var objectDeleted = utils.assign(function objectDeleted(objectID){}, {
+    connect: function() {
+        Overlays.overlayDeleted.connect(_objectDeleted);
+        // Entities.deletingEntity.connect(objectDeleted);
+        Script.scriptEnding.connect(function() {
+            Overlays.overlayDeleted.disconnect(_objectDeleted);
+            // Entities.deletingEntity.disconnect(objectDeleted);
+        });
+        // hereafter _objectDeleted.connect will be used instead
+        this.connect = utils.bind(_objectDeleted, 'connect');
+        return this.connect.apply(this, arguments);
+    },
+    disconnect: utils.bind(_objectDeleted, 'disconnect')
+});
+
+var modelHelper = module.exports.modelHelper = {
+    // Entity <-> Overlay property translations
+    _entityFromOverlay: {
+        modelURL: function url() {
+            return this.url;
+        },
+        dimensions: function dimensions() {
+            return Vec3.multiply(this.scale, this.naturalDimensions);
+        }
+    },
+    _overlayFromEntity: {
+        url: function modelURL() {
+            return this.modelURL;
+        },
+        scale: function scale() {
+            return this.dimensions && this.naturalDimensions && {
+                x: this.dimensions.x / this.naturalDimensions.x,
+                y: this.dimensions.y / this.naturalDimensions.y,
+                z: this.dimensions.z / this.naturalDimensions.z
+            };
+        }
+    },
+    objectDeleted: objectDeleted,
+    type: function(objectID) {
+        // TODO: support Model Entities (by detecting type from objectID, which is already possible)
+        return !Uuid.isNull(objectID) ? 'overlay' : null;
+    },
+    addObject: function(properties) {
+        var type = 'overlay'; // this.resolveType(properties)
+        switch (type) {
+            case 'overlay': return Overlays.addOverlay(properties.type, this.toOverlayProps(properties));
+        }
+        return false;
+    },
+    editObject: function(objectID, properties) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.editOverlay(objectID, this.toOverlayProps(properties));
+        }
+        return false;
+    },
+    deleteObject: function(objectID) {
+        return this.type(objectID) === 'overlay' && Overlays.deleteOverlay(objectID);
+    },
+    getProperty: function(objectID, propertyName) {
+        return this.type(objectID) === 'overlay' && Overlays.getProperty(objectID, propertyName);
+    },
+    getProperties: function(objectID, filter) {
+        switch (this.type(objectID)) {
+            case 'overlay':
+                filter = Array.isArray(filter) ? filter : [
+                    'position', 'rotation', 'localPosition', 'localRotation', 'parentID',
+                    'parentJointIndex', 'scale', 'name', 'visible', 'type', 'url',
+                    'dimensions', 'naturalDimensions', 'grabbable'
+                ];
+                var properties = filter.reduce(function(out, propertyName) {
+                    out[propertyName] = Overlays.getProperty(objectID, propertyName);
+                    return out;
+                }, {});
+                return this.toEntityProps(properties);
+        }
+        return null;
+    },
+    // adapt Entity conventions to Overlay (eg: { modelURL: ... } -> { url: ... })
+    toOverlayProps: function(properties) {
+        var result = {};
+        for (var from in this._overlayFromEntity) {
+            var adapter = this._overlayFromEntity[from];
+            result[from] = adapter.call(properties, from, adapter.name);
+        }
+        return utils.assign(result, properties);
+    },
+    // adapt Overlay conventions to Entity (eg: { url: ... } -> { modelURL: ... })
+    toEntityProps: function(properties) {
+        var result = {};
+        for (var from in this._entityToOverlay) {
+            var adapter = this._entityToOverlay[from];
+            result[from] = adapter.call(properties, from, adapter.name);
+        }
+        return utils.assign(result, properties);
+    },
+    editObjects: function(updatedObjects) {
+        var objectIDs = Object.keys(updatedObjects),
+            type = this.type(objectIDs[0]);
+        switch (type) {
+            case 'overlay':
+                var translated = {};
+                for (var objectID in updatedObjects) {
+                    translated[objectID] = this.toOverlayProps(updatedObjects[objectID]);
+                }
+                return Overlays.editOverlays(translated);
+        }
+        return false;
+    },
+    getJointIndex: function(objectID, name) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointNames').indexOf(name);
+        }
+        return -1;
+    },
+    getJointNames: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointNames');
+        }
+        return [];
+    },
+    // @function - derives mirrored joint names from a list of regular joint names
+    // @param {Array} - list of joint names to mirror
+    // @return {Array} - list of mirrored joint names (note: entries for non-mirrored joints will be `undefined`)
+    deriveMirroredJointNames: function(jointNames) {
+        return jointNames.map(function(name, i) {
+            if (/Left/.test(name)) {
+                return name.replace('Left', 'Right');
+            }
+            if (/Right/.test(name)) {
+                return name.replace('Right', 'Left');
+            }
+            return undefined;
+        });
+    },
+    getJointPosition: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointPositions')[index];
+        }
+        return Vec3.ZERO;
+    },
+    getJointPositions: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointPositions');
+        }
+        return [];
+    },
+    getJointOrientation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointOrientations')[index];
+        }
+        return Quat.normalize({});
+    },
+    getJointOrientations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointOrientations');
+        }
+    },
+    getJointTranslation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointTranslations')[index];
+        }
+        return Vec3.ZERO;
+    },
+    getJointTranslations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointTranslations');
+        }
+        return [];
+    },
+    getJointRotation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointRotations')[index];
+        }
+        return Quat.normalize({});
+    },
+    getJointRotations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointRotations');
+        }
+        return [];
+    }
+}; // modelHelper
+
+
+// @property {PreconditionFunction} - indicates when the model's jointNames have become available
+ModelReadyWatcher.JOINTS = function(state) {
+    return Array.isArray(state.jointNames);
+};
+// @property {PreconditionFunction} - indicates when a model's naturalDimensions have become available
+ModelReadyWatcher.DIMENSIONS = function(state) {
+    return Vec3.length(state.naturalDimensions) > 0;
+};
+// @property {PreconditionFunction} - indicates when both a model's naturalDimensions and jointNames have become available
+ModelReadyWatcher.JOINTS_AND_DIMENSIONS = function(state) {
+    // eslint-disable-next-line new-cap
+    return ModelReadyWatcher.JOINTS(state) && ModelReadyWatcher.DIMENSIONS(state);
+};
+// @property {int} - interval used for continually rechecking model readiness, until ready or a timeout occurs
+ModelReadyWatcher.RECHECK_MS = 50;
+// @property {int} - default wait time before considering a model unready-able.
+ModelReadyWatcher.DEFAULT_TIMEOUT_SECS = 10;
+
+// @private @class - waits for model to become usable inworld and tracks errors/timeouts
+// @param [Object} options -- key/value config options:
+// @param {ModelResource} options.resource - a ModelCache prefetched resource to observe for determining load state
+// @param {Uuid} options.objectID - an inworld object to observe for determining readiness states
+// @param {Function} [options.precondition=ModelReadyWatcher.JOINTS] - the precondition used to determine if the model is usable
+// @param {int} [options.maxWaitSeconds=10] - max seconds to wait for the model to become usable, after which a timeout error is emitted
+// @return {ModelReadyWatcher}
+function ModelReadyWatcher(options) {
+    options = utils.assign({
+        precondition: ModelReadyWatcher.JOINTS,
+        maxWaitSeconds: ModelReadyWatcher.DEFAULT_TIMEOUT_SECS
+    }, options);
+
+    assert(!Uuid.isNull(options.objectID), 'Error: invalid options.objectID');
+    assert(options.resource && 'state' in options.resource, 'Error: invalid options.resource');
+    assert(typeof options.precondition === 'function', 'Error: invalid options.precondition');
+
+    utils.assign(this, {
+        resource: options.resource,
+        objectID: options.objectID,
+        precondition: options.precondition,
+
+        // @signal - emitted when the model becomes ready, or with the error that prevented it
+        modelReady: utils.signal(function modelReady(error, result){}),
+
+        // @public
+        ready: false, // tracks readiness state
+        jointNames: null, // populated with detected jointNames
+        naturalDimensions: null, // populated with detected naturalDimensions
+
+        _startTime: new Date,
+        _watchdogTimer: Script.setTimeout(utils.bind(this, function() {
+            this._watchdogTimer = null;
+        }), options.maxWaitSeconds * 1000),
+        _interval: Script.setInterval(utils.bind(this, '_waitUntilReady'), ModelReadyWatcher.RECHECK_MS)
+    });
+
+    this.modelReady.connect(this, function(error, result) {
+        this.ready = !error && result;
+    });
+}
+
+ModelReadyWatcher.prototype = {
+    contructor: ModelReadyWatcher,
+    // @public method -- cancels monitoring and (if model was not yet ready) emits an error
+    cancel: function() {
+        return this._stop() && !this.ready && this.modelReady('cancelled', null);
+    },
+    // stop pending timers
+    _stop: function() {
+        var stopped = 0;
+        if (this._watchdogTimer) {
+            Script.clearTimeout(this._watchdogTimer);
+            this._watchdogTimer = null;
+            stopped++;
+        }
+        if (this._interval) {
+            Script.clearInterval(this._interval);
+            this._interval = null;
+            stopped++;
+        }
+        return stopped;
+    },
+    // the monitoring thread func
+    _waitUntilReady: function() {
+        var error = null, result = null;
+        if (!this._watchdogTimer) {
+            error = this.precondition.name || 'timeout';
+        } else if (this.resource.state === Resource.State.FAILED) {
+            error = 'prefetch_failed';
+        } else if (this.resource.state === Resource.State.FINISHED) {
+            // in theory there will always be at least one "joint name" that represents the main submesh
+            var names = modelHelper.getJointNames(this.objectID);
+            if (Array.isArray(names) && names.length) {
+                this.jointNames = names;
+            }
+            var props = modelHelper.getProperties(this.objectID, ['naturalDimensions']);
+            if (props && props.naturalDimensions && Vec3.length(props.naturalDimensions)) {
+                this.naturalDimensions = props.naturalDimensions;
+            }
+            var state = {
+                resource: this.resource,
+                objectID: this.objectID,
+                waitTime: (new Date - this._startTime) / 1000,
+                jointNames: this.jointNames,
+                naturalDimensions: this.naturalDimensions
+            };
+            if (this.precondition(state)) {
+                result = state;
+            }
+        }
+        if (error || result !== null) {
+            this._stop();
+            this.modelReady(error, result);
+        }
+    }
+}; // ModelReadyWatcher.prototype
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/utils.js b/unpublishedScripts/marketplace/doppleganger-attachments/utils.js
new file mode 100644
index 0000000000..76c6e1ef7f
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/utils.js
@@ -0,0 +1,99 @@
+/* eslint-env commonjs */
+
+module.exports = {
+    bind: bind,
+    signal: signal,
+    assign: assign,
+    assert: assert
+};
+
+// @function - bind a function to a `this` context
+// @param {Object} - the `this` context
+// @param {Function|String} - function or method name
+// @param {value} varargs... - optional curry-right arguments (passed to method after any explicit arguments)
+function bind(thiz, method, varargs) {
+    method = thiz[method] || method;
+    varargs = [].slice.call(arguments, 2);
+    return function() {
+        var args = [].slice.call(arguments).concat(varargs);
+        return method.apply(thiz, args);
+    };
+}
+
+// @function - Qt signal polyfill
+function signal(template) {
+    var callbacks = [];
+    return Object.defineProperties(function() {
+        var args = [].slice.call(arguments);
+        callbacks.forEach(function(obj) {
+            obj.handler.apply(obj.scope, args);
+        });
+    }, {
+        connect: { value: function(scope, handler) {
+            var callback = {scope: scope, handler: scope[handler] || handler || scope};
+            if (!callback.handler || !callback.handler.apply) {
+                throw new Error('invalid arguments to connect:' + [template, scope, handler]);
+            }
+            callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
+        }},
+        disconnect: { value: function(scope, handler) {
+            var match = {scope: scope, handler: scope[handler] || handler || scope};
+            callbacks = callbacks.filter(function(obj) {
+                return !(obj.scope === match.scope && obj.handler === match.handler);
+            });
+        }}
+    });
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+/* eslint-disable */
+function assign(target, varArgs) { // .length of function is 2
+    'use strict';
+    if (target == null) { // TypeError if undefined or null
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+
+    var to = Object(target);
+
+    for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+
+        if (nextSource != null) { // Skip over if undefined or null
+            for (var nextKey in nextSource) {
+                // Avoid bugs when hasOwnProperty is shadowed
+                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                    to[nextKey] = nextSource[nextKey];
+                }
+            }
+        }
+    }
+    return to;
+}
+/* eslint-enable */
+// //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+
+// examples:
+//     assert(function assertion() { return (conditions === true) }, 'assertion failed!')
+//     var neededValue = assert(idString, 'idString not specified!');
+//     assert(false, 'unexpected state');
+function assert(truthy, message) {
+    message = message || 'Assertion Failed:';
+
+    if (typeof truthy === 'function' && truthy.name === 'assertion') {
+        // extract function body to display with the assertion message
+        var assertion = (truthy+'').replace(/[\r\n]/g, ' ')
+            .replace(/^[^{]+\{|\}$|^\s*|\s*$/g, '').trim()
+            .replace(/^return /,'').replace(/\s[\r\n\t\s]+/g, ' ');
+        message += ' ' + JSON.stringify(assertion);
+        try {
+            truthy = truthy();
+        } catch (e) {
+            message += '(exception: ' + e +')';
+        }
+    }
+    if (!truthy) {
+        message += ' ('+truthy+')';
+        throw new Error(message);
+    }
+    return truthy;
+}
diff --git a/scripts/system/app-doppleganger.js b/unpublishedScripts/marketplace/doppleganger-mirror/app-doppleganger.js
similarity index 95%
rename from scripts/system/app-doppleganger.js
rename to unpublishedScripts/marketplace/doppleganger-mirror/app-doppleganger.js
index d7f85e5767..f4c7bf99c0 100644
--- a/scripts/system/app-doppleganger.js
+++ b/unpublishedScripts/marketplace/doppleganger-mirror/app-doppleganger.js
@@ -14,8 +14,8 @@ var DopplegangerClass = Script.require('./doppleganger.js');
 
 var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
     button = tablet.addButton({
-        icon: "icons/tablet-icons/doppleganger-i.svg",
-        activeIcon: "icons/tablet-icons/doppleganger-a.svg",
+        icon: Script.resolvePath('./doppleganger-i.svg'),
+        activeIcon: Script.resolvePath('./doppleganger-a.svg'),
         text: 'MIRROR'
     });
 
diff --git a/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-a.svg b/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-a.svg
new file mode 100644
index 0000000000..100986647e
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-a.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 50 50"
+   style="enable-background:new 0 0 50 50;"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="doppleganger-a.svg"><metadata
+     id="metadata36"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs34"><linearGradient
+       id="linearGradient8353"
+       osb:paint="solid"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8355" /></linearGradient></defs><sodipodi:namedview
+     pagecolor="#ff4900"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1004"
+     id="namedview32"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="-3.2806499"
+     inkscape:cy="20.640561"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4308" /><style
+     type="text/css"
+     id="style4">
+	.st0{fill:#FFFFFF;}
+</style><g
+     id="Layer_2" /><g
+     id="Layer_1"
+     style="fill:#000000;fill-opacity:1"><g
+       id="g8375"
+       transform="matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)"><g
+         id="g4308"
+         transform="translate(1.0333645e-6,0)"><g
+           id="g8"
+           style="fill:#000000;fill-opacity:1"
+           transform="matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)"><path
+             class="st0"
+             d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
+             id="path10"
+             style="fill:#000000;fill-opacity:1"
+             inkscape:connector-curvature="0" /><path
+             class="st0"
+             d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
+             id="path12"
+             style="fill:#000000;fill-opacity:1"
+             inkscape:connector-curvature="0" /></g><g
+           id="g8-3"
+           style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
+           transform="matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)"><path
+             class="st0"
+             d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
+             id="path10-6"
+             style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
+             inkscape:connector-curvature="0" /><path
+             class="st0"
+             d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
+             id="path12-7"
+             style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1"
+             inkscape:connector-curvature="0" /></g></g><rect
+         style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4306"
+         width="0.12393159"
+         height="46.498554"
+         x="25.227457"
+         y="1.8070068"
+         rx="0"
+         ry="0.9407174" /></g></g></svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-i.svg b/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-i.svg
new file mode 100644
index 0000000000..0c55e0e0c7
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger-i.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 50 50"
+   style="enable-background:new 0 0 50 50;"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="doppleganger-i.svg"><metadata
+     id="metadata36"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs34"><linearGradient
+       id="linearGradient8353"
+       osb:paint="solid"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8355" /></linearGradient></defs><sodipodi:namedview
+     pagecolor="#ff4900"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1004"
+     id="namedview32"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="-3.2806499"
+     inkscape:cy="20.640561"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4308" /><style
+     type="text/css"
+     id="style4">
+	.st0{fill:#FFFFFF;}
+</style><g
+     id="Layer_2" /><g
+     id="Layer_1"
+     style="fill:#000000;fill-opacity:1"><g
+       id="g8375"
+       transform="matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)"><g
+         id="g4308"
+         transform="translate(1.0333645e-6,0)"><g
+           id="g8"
+           style="fill:#ffffff;fill-opacity:1"
+           transform="matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)"><path
+             class="st0"
+             d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
+             id="path10"
+             style="fill:#ffffff;fill-opacity:1"
+             inkscape:connector-curvature="0" /><path
+             class="st0"
+             d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
+             id="path12"
+             style="fill:#ffffff;fill-opacity:1"
+             inkscape:connector-curvature="0" /></g><g
+           id="g8-3"
+           style="opacity:0.5;fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
+           transform="matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)"><path
+             class="st0"
+             d="m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z"
+             id="path10-6"
+             style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
+             inkscape:connector-curvature="0" /><path
+             class="st0"
+             d="m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z"
+             id="path12-7"
+             style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1"
+             inkscape:connector-curvature="0" /></g></g><rect
+         style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187000000010;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4306"
+         width="0.12393159"
+         height="46.498554"
+         x="25.227457"
+         y="1.8070068"
+         rx="0"
+         ry="0.9407174" /></g></g></svg>
\ No newline at end of file
diff --git a/scripts/system/doppleganger.js b/unpublishedScripts/marketplace/doppleganger-mirror/doppleganger.js
similarity index 100%
rename from scripts/system/doppleganger.js
rename to unpublishedScripts/marketplace/doppleganger-mirror/doppleganger.js