diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 105bcb7cb0..f6c0e7b2e5 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -71,9 +71,13 @@ RUN mkdir "$HIFI_BASE" && \
     mkdir "$HIFI_VCPKG_BASE" && \ 
     mkdir "$HIFI_ANDROID_PRECOMPILED"
 
-RUN git clone https://github.com/jherico/hifi.git && \
+# Checkout a relatively recent commit from the main repository and use it to cache the 
+# gradle and vcpkg dependencies
+# This commit ID should be updated whenever someone changes the dependency list
+# in cmake/ports
+RUN git clone https://github.com/highfidelity/hifi.git && \
     cd ~/hifi && \
-    git checkout quest/build
+    git checkout 796bfb5d6715ff14c2e60f3ee8fac1465b7578c6
 
 WORKDIR /home/jenkins/hifi
 
diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 3937d5f799..ee1e21c837 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -84,7 +84,7 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceManager>();
-    DependencyManager::set<PluginManager>();
+    DependencyManager::set<PluginManager>()->instantiate();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -433,7 +433,7 @@ void Agent::executeScript() {
 
         using namespace recording;
         static const FrameType AUDIO_FRAME_TYPE = Frame::registerFrameType(AudioConstants::getAudioFrameName());
-        Frame::registerFrameHandler(AUDIO_FRAME_TYPE, [this, &scriptedAvatar](Frame::ConstPointer frame) {
+        Frame::registerFrameHandler(AUDIO_FRAME_TYPE, [this, &player, &scriptedAvatar](Frame::ConstPointer frame) {
             if (_shouldMuteRecordingAudio) {
                 return;
             }
@@ -442,9 +442,18 @@ void Agent::executeScript() {
 
             QByteArray audio(frame->data);
 
+            int16_t* samples = reinterpret_cast<int16_t*>(audio.data());
+            int numSamples = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
+
+            auto volume = player->getVolume();
+            if (volume >= 0.0f && volume < 1.0f) {
+                int32_t fract = (int32_t)(volume * (float)(1 << 16));   // Q16
+                for (int i = 0; i < numSamples; i++) {
+                    samples[i] = (fract * (int32_t)samples[i]) >> 16;
+                }
+            }
+
             if (_isNoiseGateEnabled) {
-                int16_t* samples = reinterpret_cast<int16_t*>(audio.data());
-                int numSamples = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
                 _audioGate.render(samples, samples, numSamples);
             }
 
@@ -511,6 +520,7 @@ void Agent::executeScript() {
 
         DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
 
+        DependencyManager::get<ScriptEngines>()->runScriptInitializers(_scriptEngine);
         _scriptEngine->run();
 
         Frame::clearFrameHandler(AUDIO_FRAME_TYPE);
diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 1ef375b562..a1a2b7c1b5 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -22,6 +22,7 @@
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <Assignment.h>
+#include <CrashAnnotations.h>
 #include <LogHandler.h>
 #include <LogUtils.h>
 #include <LimitedNodeList.h>
@@ -144,6 +145,7 @@ AssignmentClient::~AssignmentClient() {
 }
 
 void AssignmentClient::aboutToQuit() {
+    crash::annotations::setShutdownState(true);
     stopAssignmentClient();
 }
 
@@ -173,6 +175,7 @@ void AssignmentClient::sendStatusPacketToACM() {
 
 void AssignmentClient::sendAssignmentRequest() {
     if (!_currentAssignment && !_isAssigned) {
+        crash::annotations::setShutdownState(false);
 
         auto nodeList = DependencyManager::get<NodeList>();
 
@@ -289,6 +292,8 @@ void AssignmentClient::handleAuthenticationRequest() {
 }
 
 void AssignmentClient::assignmentCompleted() {
+    crash::annotations::setShutdownState(true);
+    
     // we expect that to be here the previous assignment has completely cleaned up
     assert(_currentAssignment.isNull());
 
diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index a87200dc5b..c5b228bd16 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -22,6 +22,7 @@
 #include <HifiConfigVariantMap.h>
 #include <SharedUtil.h>
 #include <ShutdownEventListener.h>
+#include <shared/ScriptInitializerMixin.h>
 
 #include "Assignment.h"
 #include "AssignmentClient.h"
@@ -239,7 +240,11 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     QThread::currentThread()->setObjectName("main thread");
 
+    LogHandler::getInstance().moveToThread(thread());
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
+    DependencyManager::set<ScriptInitializers>();
 
     if (numForks || minForks || maxForks) {
         AssignmentClientMonitor* monitor =  new AssignmentClientMonitor(numForks, minForks, maxForks,
diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 45511cf6cd..36fd04681a 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -499,6 +499,8 @@ void AvatarMixer::handleAvatarKilled(SharedNodePointer avatarNode) {
            } else {
                _sessionDisplayNames.erase(displayNameIter);
            }
+
+            nodeData->getAvatar().stopChallengeTimer();
         }
 
         std::unique_ptr<NLPacket> killPacket;
diff --git a/assignment-client/src/avatars/MixerAvatar.cpp b/assignment-client/src/avatars/MixerAvatar.cpp
index 29f7e9ebd2..ac633d9388 100644
--- a/assignment-client/src/avatars/MixerAvatar.cpp
+++ b/assignment-client/src/avatars/MixerAvatar.cpp
@@ -33,12 +33,12 @@ MixerAvatar::MixerAvatar() {
     _challengeTimer.setSingleShot(true);
     _challengeTimer.setInterval(CHALLENGE_TIMEOUT_MS);
     
-    _challengeTimer.callOnTimeout([this]() {
+    _challengeTimer.callOnTimeout(this, [this]() {
         if (_verifyState == challengeClient) {
             _pendingEvent = false;
             _verifyState = verificationFailed;
             _needsIdentityUpdate = true;
-            qCDebug(avatars) << "Dynamic verification TIMED-OUT for " << getDisplayName() << getSessionUUID();
+            qCDebug(avatars) << "Dynamic verification TIMED-OUT for" << getDisplayName() << getSessionUUID();
         } else {
             qCDebug(avatars) << "Ignoring timeout of avatar challenge";
         }
@@ -287,7 +287,7 @@ void MixerAvatar::processCertifyEvents() {
                         << ":" << _dynamicMarketResponse;
                 }
             } else {
-                qCDebug(avatars) << "Get owner status failed for " << getDisplayName() << _marketplaceIdFromURL <<
+                qCDebug(avatars) << "Get owner status failed for" << getDisplayName() << _marketplaceIdFromURL <<
                     "message:" << responseJson["message"].toString();
                 _verifyState = error;
             }
@@ -332,7 +332,7 @@ void MixerAvatar::sendOwnerChallenge() {
 void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
     QByteArray avatarID;
     QMutexLocker certifyLocker(&_avatarCertifyLock);
-    QMetaObject::invokeMethod(&_challengeTimer, &QTimer::stop);
+    stopChallengeTimer();
     if (_verifyState == challengeClient) {
         QByteArray responseData = response.readAll();
         if (responseData.length() < 8) {
@@ -356,7 +356,7 @@ void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
         _verifyState = challengeResult ? verificationSucceeded : verificationFailed;
         _needsIdentityUpdate = true;
         if (_verifyState == verificationFailed) {
-            qCDebug(avatars) << "Dynamic verification FAILED for " << getDisplayName() << getSessionUUID();
+            qCDebug(avatars) << "Dynamic verification FAILED for" << getDisplayName() << getSessionUUID();
         } else {
             qCDebug(avatars) << "Dynamic verification SUCCEEDED for" << getDisplayName() << getSessionUUID();
         }
@@ -365,3 +365,11 @@ void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
         qCDebug(avatars) << "WARNING: Unexpected avatar challenge-response in state" << stateToName(_verifyState);
     }
 }
+
+void MixerAvatar::stopChallengeTimer() {
+    if (QThread::currentThread() == thread()) {
+        _challengeTimer.stop();
+    } else {
+        QMetaObject::invokeMethod(&_challengeTimer, &QTimer::stop);
+    }
+}
diff --git a/assignment-client/src/avatars/MixerAvatar.h b/assignment-client/src/avatars/MixerAvatar.h
index 2ef4d16dc4..39095def50 100644
--- a/assignment-client/src/avatars/MixerAvatar.h
+++ b/assignment-client/src/avatars/MixerAvatar.h
@@ -34,6 +34,8 @@ public:
     void processCertifyEvents();
     void processChallengeResponse(ReceivedMessage& response);
 
+    void stopChallengeTimer();
+
     // Avatar certification/verification:
     enum VerifyState {
         nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse,
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index 06632dabb0..6bbf4a0e3b 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -17,9 +17,9 @@
 #include <QJsonDocument>
 
 #include <EntityTree.h>
-#include <SimpleEntitySimulation.h>
 #include <ResourceCache.h>
 #include <ScriptCache.h>
+#include <plugins/PluginManager.h>
 #include <EntityEditFilters.h>
 #include <NetworkingConstants.h>
 #include <hfm/ModelFormatRegistry.h>
@@ -36,12 +36,13 @@ const char* LOCAL_MODELS_PERSIST_FILE = "resources/models.svo";
 
 EntityServer::EntityServer(ReceivedMessage& message) :
     OctreeServer(message),
-    _entitySimulation(NULL),
+    _entitySimulation(nullptr),
     _dynamicDomainVerificationTimer(this)
 {
     DependencyManager::set<ResourceManager>();
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<ScriptCache>();
+    DependencyManager::set<PluginManager>()->instantiate();
 
     DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
     DependencyManager::set<AssignmentDynamicFactory>();
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 4d3f1ee89f..9bb3a237e0 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -16,9 +16,11 @@
 
 #include <memory>
 
-#include "EntityItem.h"
+#include <EntityItem.h>
+#include <EntityTree.h>
+#include <SimpleEntitySimulation.h>
+
 #include "EntityServerConsts.h"
-#include "EntityTree.h"
 
 /// Handles assignments of type EntityServer - sending entities to various clients.
 
@@ -27,9 +29,6 @@ struct ViewerSendingStats {
     quint64 lastEdited;
 };
 
-class SimpleEntitySimulation;
-using SimpleEntitySimulationPointer = std::shared_ptr<SimpleEntitySimulation>;
-
 class EntityServer : public OctreeServer, public NewlyCreatedEntityHook {
     Q_OBJECT
 public:
diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index f1a6c97831..ea002a27c6 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -64,7 +64,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::set<ResourceScriptingInterface>();
 
     DependencyManager::set<ResourceManager>();
-    DependencyManager::set<PluginManager>();
+    DependencyManager::set<PluginManager>()->instantiate();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -301,10 +301,17 @@ void EntityScriptServer::run() {
 
     entityScriptingInterface->setEntityTree(_entityViewer.getTree());
 
-    DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
+    auto treePtr = _entityViewer.getTree();
+    DependencyManager::set<AssignmentParentFinder>(treePtr);
 
+    if (!_entitySimulation) {
+        SimpleEntitySimulationPointer simpleSimulation { new SimpleEntitySimulation() };
+        simpleSimulation->setEntityTree(treePtr);
+        treePtr->setSimulation(simpleSimulation);
+        _entitySimulation = simpleSimulation;
+    }
 
-    auto tree = _entityViewer.getTree().get();
+    auto tree = treePtr.get();
     connect(tree, &EntityTree::deletingEntity, this, &EntityScriptServer::deletingEntity, Qt::QueuedConnection);
     connect(tree, &EntityTree::addingEntity, this, &EntityScriptServer::addingEntity, Qt::QueuedConnection);
     connect(tree, &EntityTree::entityServerScriptChanging, this, &EntityScriptServer::entityServerScriptChanging, Qt::QueuedConnection);
@@ -451,10 +458,11 @@ void EntityScriptServer::resetEntitiesScriptEngine() {
 
     connect(newEngine.data(), &ScriptEngine::update, this, [this] {
         _entityViewer.queryOctree();
+        _entityViewer.getTree()->preUpdate();
         _entityViewer.getTree()->update();
     });
 
-
+    scriptEngines->runScriptInitializers(newEngine);
     newEngine->runInThread();
     auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
     DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
index 944fee36a3..b795339174 100644
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -21,6 +21,7 @@
 #include <EntityEditPacketSender.h>
 #include <plugins/CodecPlugin.h>
 #include <ScriptEngine.h>
+#include <SimpleEntitySimulation.h>
 #include <ThreadedAssignment.h>
 #include "../entities/EntityTreeHeadlessViewer.h"
 
@@ -75,6 +76,7 @@ private:
 
     static int _entitiesScriptEngineCount;
     ScriptEnginePointer _entitiesScriptEngine;
+    SimpleEntitySimulationPointer _entitySimulation;
     EntityEditPacketSender _entityEditSender;
     EntityTreeHeadlessViewer _entityViewer;
 
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index aaca33ab1c..45cef27727 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -34,7 +34,7 @@ if (WIN32)
   list(APPEND CMAKE_PREFIX_PATH "${WINDOW_SDK_PATH}")
 
   # /wd4351 disables warning C4351: new behavior: elements of array will be default initialized
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /wd4351")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP${HIFI_MAX_BUILD_CORES} /wd4351")
   # /LARGEADDRESSAWARE enables 32-bit apps to use more than 2GB of memory.
   # Caveats: http://stackoverflow.com/questions/2288728/drawbacks-of-using-largeaddressaware-for-32-bit-windows-executables
   # TODO: Remove when building 64-bit.
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index f8cff9f773..bf98dba29d 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -38,7 +38,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(BUILD_ORGANIZATION "High Fidelity")
     set(HIGH_FIDELITY_PROTOCOL "hifi")
     set(HIGH_FIDELITY_APP_PROTOCOL "hifiapp")
-    set(INTERFACE_BUNDLE_NAME "Interface")
+    set(INTERFACE_BUNDLE_NAME "interface")
     set(INTERFACE_ICON_PREFIX "interface")
 
     # add definition for this release type
@@ -61,7 +61,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(PR_BUILD 1)
     set(BUILD_VERSION "PR${RELEASE_NUMBER}")
     set(BUILD_ORGANIZATION "High Fidelity - PR${RELEASE_NUMBER}")
-    set(INTERFACE_BUNDLE_NAME "Interface")
+    set(INTERFACE_BUNDLE_NAME "interface")
     set(INTERFACE_ICON_PREFIX "interface-beta")
 
     # add definition for this release type
@@ -70,7 +70,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(DEV_BUILD 1)
     set(BUILD_VERSION "dev")
     set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}")
-    set(INTERFACE_BUNDLE_NAME "Interface")
+    set(INTERFACE_BUNDLE_NAME "interface")
     set(INTERFACE_ICON_PREFIX "interface-beta")
 
     # add definition for this release type
@@ -192,12 +192,12 @@ macro(SET_PACKAGING_PARAMETERS)
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity")
       set(CONSOLE_SHORTCUT_NAME "Console")
       set(SANDBOX_SHORTCUT_NAME "Sandbox")
       set(APP_USER_MODEL_ID "com.highfidelity.console")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION_NO_SHA}")
       set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
       set(SANDBOX_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
     endif ()
diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake
index bc66484c30..1ce0b0ca6e 100644
--- a/cmake/macros/SetupHifiClientServerPlugin.cmake
+++ b/cmake/macros/SetupHifiClientServerPlugin.cmake
@@ -7,7 +7,8 @@
 #
 macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
   set(${TARGET_NAME}_SHARED 1)
-  setup_hifi_library(${ARGV})
+  set(PLUGIN_SUBFOLDER ${ARGN})
+  setup_hifi_library()
 
   if (BUILD_CLIENT)
     add_dependencies(interface ${TARGET_NAME})
@@ -27,6 +28,11 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
     set(SERVER_PLUGIN_PATH "plugins")
   endif()
 
+  if (PLUGIN_SUBFOLDER)
+      set(CLIENT_PLUGIN_PATH "${CLIENT_PLUGIN_PATH}/${PLUGIN_SUBFOLDER}")
+      set(SERVER_PLUGIN_PATH "${SERVER_PLUGIN_PATH}/${PLUGIN_SUBFOLDER}")
+  endif()
+
   if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_GENERATOR STREQUAL "Unix Makefiles")
     set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/${CLIENT_PLUGIN_PATH}/")
     set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/${SERVER_PLUGIN_PATH}/")
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index 04687e2c84..108786a651 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -20,7 +20,7 @@ macro(SETUP_HIFI_LIBRARY)
   foreach(SRC ${AVX_SRCS})
     if (WIN32)
       set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS /arch:AVX)
-    elseif (APPLE OR UNIX)
+    elseif (APPLE OR (UNIX AND NOT ANDROID))
       set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS -mavx)
     endif()
   endforeach()
@@ -30,7 +30,7 @@ macro(SETUP_HIFI_LIBRARY)
   foreach(SRC ${AVX2_SRCS})
     if (WIN32)
       set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS /arch:AVX2)
-    elseif (APPLE OR UNIX)
+    elseif (APPLE OR (UNIX AND NOT ANDROID))
       set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
     endif()
   endforeach()
@@ -44,7 +44,7 @@ macro(SETUP_HIFI_LIBRARY)
       if (COMPILER_SUPPORTS_AVX512)
         set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS /arch:AVX512)
       endif()
-    elseif (APPLE OR UNIX)
+    elseif (APPLE OR (UNIX AND NOT ANDROID))
       check_cxx_compiler_flag("-mavx512f" COMPILER_SUPPORTS_AVX512)
       if (COMPILER_SUPPORTS_AVX512)
         set_source_files_properties(${SRC} PROPERTIES COMPILE_FLAGS -mavx512f)
diff --git a/cmake/macros/TargetWebRTC.cmake b/cmake/macros/TargetWebRTC.cmake
index d2821528df..d215b0698e 100644
--- a/cmake/macros/TargetWebRTC.cmake
+++ b/cmake/macros/TargetWebRTC.cmake
@@ -15,9 +15,11 @@ macro(TARGET_WEBRTC)
         # select_library_configurations(WEBRTC)
     else()
         set(WEBRTC_INCLUDE_DIRS "${VCPKG_INSTALL_ROOT}/include/webrtc")
-        find_library(WEBRTC_LIBRARY NAMES webrtc PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
         target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${WEBRTC_INCLUDE_DIRS})
-        target_link_libraries(${TARGET_NAME} ${WEBRTC_LIBRARY})
+        find_library(WEBRTC_LIBRARY_RELEASE webrtc PATHS ${VCPKG_INSTALL_ROOT}/lib NO_DEFAULT_PATH)
+        find_library(WEBRTC_LIBRARY_DEBUG webrtc PATHS ${VCPKG_INSTALL_ROOT}/debug/lib NO_DEFAULT_PATH)
+        select_library_configurations(WEBRTC)
+        target_link_libraries(${TARGET_NAME} ${WEBRTC_LIBRARIES})
     endif()
 
 
diff --git a/cmake/modules/FindiViewHMD.cmake b/cmake/modules/FindiViewHMD.cmake
deleted file mode 100644
index e408c92380..0000000000
--- a/cmake/modules/FindiViewHMD.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  FindiViewHMD.cmake
-#
-#  Try to find the SMI iViewHMD eye tracker library
-#
-#  You must provide a IVIEWHMD_ROOT_DIR which contains 3rdParty, include, and libs directories
-#
-#  Once done this will define
-#
-#  IVIEWHMD_FOUND - system found iViewHMD
-#  IVIEWHMD_INCLUDE_DIRS - the iViewHMD include directory
-#  IVIEWHMD_LIBRARIES - link this to use iViewHMD
-#
-#  Created on 27 Jul 2015 by David Rowe
-#  Copyright 2015 High Fidelity, Inc.
-#
-
-if (WIN32)
-
-    include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-    hifi_library_search_hints("iViewHMD")
-
-    find_path(IVIEWHMD_INCLUDE_DIRS iViewHMDAPI.h PATH_SUFFIXES include HINTS ${IVIEWHMD_SEARCH_DIRS})
-    find_library(IVIEWHMD_LIBRARIES NAMES iViewHMDAPI PATH_SUFFIXES libs/x86 HINTS ${IVIEWHMD_SEARCH_DIRS})
-    find_path(IVIEWHMD_API_DLL_PATH iViewHMDAPI.dll PATH_SUFFIXES libs/x86 HINTS ${IVIEWHMD_SEARCH_DIRS})
-    list(APPEND IVIEWHMD_REQUIREMENTS IVIEWHMD_INCLUDE_DIRS IVIEWHMD_LIBRARIES IVIEWHMD_API_DLL_PATH)
-
-    find_path(IVIEWHMD_DLL_PATH_3RD_PARTY libiViewNG.dll PATH_SUFFIXES 3rdParty HINTS ${IVIEWHMD_SEARCH_DIRS})
-    list(APPEND IVIEWHMD_REQUIREMENTS IVIEWHMD_DLL_PATH_3RD_PARTY)
-
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(IVIEWHMD DEFAULT_MSG ${IVIEWHMD_REQUIREMENTS})
-
-    add_paths_to_fixup_libs(${IVIEWHMD_API_DLL_PATH} ${IVIEWHMD_DLL_PATH_3RD_PARTY})
-
-    mark_as_advanced(IVIEWHMD_INCLUDE_DIRS IVIEWHMD_LIBRARIES IVIEWHMD_SEARCH_DIRS)
-
-endif()
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index cc7a6929a2..9af99f927d 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -1156,7 +1156,17 @@ FunctionEnd
 
 Section "-Core installation"
 
-  ;The following delete blocks are temporary and can be removed once users who had the initial installer have updated
+  ; 2016-02-25 - The following delete blocks are temporary and can be removed once users who had the initial installer have updated
+  ; 2019-09-10 - (3 and a half years later) Sure they are buddy.  Sure they are.
+
+  ; MessageBox MB_OK|MB_ICONEXCLAMATION "installer type is @INSTALLER_TYPE@"
+
+  ;Delete any server executables that might have been installed by bad versions of the client-only installer, but ONLY if we are a client-only installer
+  ${If} "@INSTALLER_TYPE@" == "client_only"
+    ; MessageBox MB_OK|MB_ICONEXCLAMATION "trying to delete server binaries"
+    Delete "$INSTDIR\assignment-client.exe"
+    Delete "$INSTDIR\domain-server.exe"
+  ${EndIf}
 
   ;Delete any server-console files installed before it was placed in sub-folder
   Delete "$INSTDIR\server-console.exe"
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 9cb4c2cab9..b854955953 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,5 +1,5 @@
 {
-  "version": 2.3,
+  "version": 2.4,
   "settings": [
     {
       "name": "metaverse",
@@ -1705,6 +1705,114 @@
         }
       ]
     },
+    {
+      "name": "oauth",
+      "label": "OAuth",
+      "show_on_enable": true,
+      "settings": [
+        {
+          "name": "enable",
+          "type": "checkbox",
+          "default": false,
+          "hidden": true
+        },
+        {
+          "name": "admin-users",
+          "label": "Admin Users",
+          "type": "table",
+          "can_add_new_rows": true,
+          "help": "Any of these users can administer the domain.",
+          "numbered": false,
+          "backup": false,
+          "advanced": false,
+          "columns": [
+            {
+              "name": "username",
+              "label": "Username",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "admin-roles",
+          "label": "Admin Roles",
+          "type": "table",
+          "can_add_new_rows": true,
+          "help": "Any user with any of these metaverse roles can administer the domain.",
+          "numbered": false,
+          "backup": false,
+          "advanced": true,
+          "columns": [
+            {
+              "name": "role",
+              "label": "Role",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "client-id",
+          "label": "Client ID",
+          "help": "OAuth client ID.",
+          "default": "",
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "client-secret",
+          "label": "Client Secret",
+          "help": "OAuth client secret.",
+          "type": "password",
+          "password_placeholder": "******",
+          "value-hidden": true,
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "provider",
+          "label": "Provider",
+          "help": "OAuth provider URL.",
+          "default": "https://metaverse.highfidelity.com",
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "hostname",
+          "label": "Hostname",
+          "help": "OAuth hostname.",
+          "default": "",
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "key-passphrase",
+          "label": "SSL Private Key Passphrase",
+          "help": "SSL Private Key Passphrase",
+          "type": "password",
+          "password_placeholder": "******",
+          "value-hidden": true,
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "cert-fingerprint",
+          "type": "hidden",
+          "readonly": true,
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "cert",
+          "advanced":  true,
+          "backup": false
+        },
+        {
+          "name": "key",
+          "advanced":  true,
+          "backup": false
+        }
+      ]
+    },
     {
       "name": "automatic_content_archives",
       "label": "Automatic Content Archives",
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index bd96f636a8..d3f5baa2f9 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -2,6 +2,9 @@ var DomainInfo = null;
 
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced) {
+    if (setting.hidden) {
+        return "";
+    }
     form_group = "<div class='form-group " +
         (isAdvanced ? Settings.ADVANCED_CLASS : "") + " " +
         (setting.deprecated ? Settings.DEPRECATED_CLASS : "" ) + "' " +
@@ -82,8 +85,9 @@ var viewHelpers = {
             "placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
             "' value='" + (_.has(setting, 'password_placeholder') ? setting.password_placeholder : setting_value) + "'/>"
         }
-
-        form_group += "<span class='help-block'>" + setting.help + "</span>"
+        if (setting.help) {
+          form_group += "<span class='help-block'>" + setting.help + "</span>"
+        }
       }
     }
 
@@ -114,12 +118,17 @@ function reloadSettings(callback) {
       data.descriptions.push(Settings.extraGroupsAtEnd[endGroupIndex]);
     }
 
+    data.descriptions = data.descriptions.map(function(x) {
+      x.hidden = x.hidden || (x.show_on_enable && data.values[x.name] && !data.values[x.name].enable);
+      return x;
+    });
+
     $('#panels').html(Settings.panelsTemplate(data));
 
     Settings.data = data;
     Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
 
-    Settings.afterReloadActions();
+    Settings.afterReloadActions(data);
 
     // setup any bootstrap switches
     $('.toggle-checkbox').bootstrapSwitch();
@@ -129,10 +138,14 @@ function reloadSettings(callback) {
     Settings.pendingChanges = 0;
 
     // call the callback now that settings are loaded
-    callback(true);
+    if (callback) { 
+      callback(true);
+    }
   }).fail(function() {
     // call the failure object since settings load faild
-    callback(false)
+    if (callback) {
+      callback(false);
+    }
   });
 }
 
@@ -237,14 +250,14 @@ $(document).ready(function(){
 
             // set focus to the first input in the new row
             $target.closest('table').find('tr.inputs input:first').focus();
-          }
+          } else {
+              var tableRows = sibling.parent();
+              var tableBody = tableRows.parent();
 
-          var tableRows = sibling.parent();
-          var tableBody = tableRows.parent();
-
-          // if theres no more siblings, we should jump to a new row
-          if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
-              tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
+              // if theres no more siblings, we should jump to a new row
+              if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
+                  tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
+              }
           }
         }
 
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 08d0550841..136d5b0ebc 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -18,7 +18,19 @@ $(document).ready(function(){
   Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex;
   var METAVERSE_URL = URLs.METAVERSE_URL;
 
-  Settings.afterReloadActions = function() {
+  var SSL_PRIVATE_KEY_FILE_ID = 'ssl-private-key-file';
+  var SSL_PRIVATE_KEY_CONTENTS_ID = 'key-contents';
+  var SSL_PRIVATE_KEY_CONTENTS_NAME = 'oauth.key-contents';
+  var SSL_CERT_UPLOAD_ID = 'ssl-cert-button';
+  var SSL_CERT_FILE_ID = 'ssl-cert-file';
+  var SSL_CERT_FINGERPRINT_ID = 'cert-fingerprint';
+  var SSL_CERT_FINGERPRINT_SPAN_ID = 'cert-fingerprint-span-id';
+  var SSL_CERT_CONTENTS_ID = 'cert-contents';
+  var SSL_CERT_CONTENTS_NAME = 'oauth.cert-contents';
+  var SSL_PRIVATE_KEY_PATH = 'oauth.key';
+  var SSL_CERT_PATH = 'oauth.cert';
+
+  Settings.afterReloadActions = function(data) {
 
     getMetaverseUrl(function(metaverse_url) {
       METAVERSE_URL = metaverse_url;
@@ -32,6 +44,8 @@ $(document).ready(function(){
       setupDomainNetworkingSettings();
       // setupDomainLabelSetting();
 
+      setupSettingsOAuth(data);
+
       setupSettingsBackup();
 
       if (domainIDIsSet()) {
@@ -124,6 +138,48 @@ $(document).ready(function(){
       }
     }
 
+    if (formJSON["oauth"]) {
+      var private_key = formJSON["oauth"]["key-contents"];
+      var cert = formJSON["oauth"]["cert-contents"];
+      var oauthErrors = "";
+      if (private_key != undefined) {
+        var pattern = /-+BEGIN PRIVATE KEY-+[A-Za-z0-9+/\n=]*-+END PRIVATE KEY-+/m;
+        if (!pattern.test(private_key)) {
+          oauthErrors += "Private key must be in PEM format<BR/>";
+        }
+      }
+      if (cert != undefined) {
+        var pattern = /-+BEGIN CERTIFICATE-+[A-Za-z0-9+/\n=]*-+END CERTIFICATE-+/m;
+        if (!pattern.test(cert)) {
+          oauthErrors += "Certificate must be in PEM format<BR/>";
+        }
+      }
+      if ($('#oauth.panel').length) {
+        if (!$('input[name="oauth.client-id"]').val()) {
+          oauthErrors += "OAuth requires a client Id.<BR/>";
+        }
+        if (!$('input[name="oauth.provider"]').val()) {
+          oauthErrors += "OAuth requires a provider.<BR/>";
+        }
+        if (!$('input[name="oauth.hostname"]').val()) {
+          oauthErrors += "OAuth requires a hostname.<BR/>";
+        }
+        if (!$('input[name="' + SSL_PRIVATE_KEY_PATH + '"]').val() && !$('input[name="' + SSL_PRIVATE_KEY_CONTENTS_NAME + '"]').val()) {
+          oauthErrors += "OAuth requires an SSL Private Key.<BR/>";
+        }
+        if (!$('input[name="' + SSL_CERT_PATH + '"]').val() && !$('input[name="' + SSL_CERT_CONTENTS_NAME + '"]').val()) {
+          oauthErrors += "OAuth requires an SSL Certificate.<BR/>";
+        }
+        if (!$("table[name='oauth.admin-users'] tr.value-row").length &&
+            !$("table[name='oauth.admin-roles'] tr.value-row").length) {
+          oauthErrors += "OAuth must have at least one admin user or admin role.<BR/>";
+        }
+      }
+      if (oauthErrors) {
+        bootbox.alert({ "message": oauthErrors, "title": "OAuth Configuration Error" });
+        return false;
+      }
+    }
     postSettings(formJSON);
   };
 
@@ -1035,6 +1091,67 @@ $(document).ready(function(){
     });
   }
 
+  function setupSettingsOAuth(data) {
+    // construct the HTML needed for the settings backup panel
+    var html = "<div class='form-group undefined'>";
+    html += "<label class='control-label'>SSL Private Key</label><BR/>";
+    html += "<label id='key-path-label'class='control-label'>Path</label>";
+    html += "<input id='" + SSL_PRIVATE_KEY_FILE_ID + "' type='file' accept='.key'/>";
+    html += "<input id='" + SSL_PRIVATE_KEY_CONTENTS_ID + "' name='" + SSL_PRIVATE_KEY_CONTENTS_NAME + "' type='hidden'/>";
+    html += "</div>";
+    html += "<div class='form-group undefined'>";
+    html += "<label class='control-label'>SSL Cert</label>";
+    html += "<div id='cert-fingerprint'><b>Fingerprint:</b><span id='" + SSL_CERT_FINGERPRINT_SPAN_ID + "'>" + data.values.oauth["cert-fingerprint"] + "</span></div>";
+    html += "<label id='cert-path-label' class='control-label'>Path</label>";
+    html += "<input id='" + SSL_CERT_FILE_ID + "' type='file' accept='.cer,.crt'/>";
+    html += "<input id='" + SSL_CERT_CONTENTS_ID + "' name='" + SSL_CERT_CONTENTS_NAME + "' type='hidden'/>";
+    html += "</div>";
+
+    $('#oauth-advanced').append(html);
+
+    $('#key-path-label').after($('[data-keypath="' + SSL_PRIVATE_KEY_PATH + '"]'));
+    $('#cert-path-label').after($('[data-keypath="' + SSL_CERT_PATH + '"]'));
+    $('[name="' + SSL_PRIVATE_KEY_PATH + '"]').val(data.values.oauth.key);
+    $('[name="' + SSL_CERT_PATH + '"]').val(data.values.oauth.cert);
+
+    $('body').on('change input propertychange', '#' + SSL_PRIVATE_KEY_FILE_ID, function(e){
+      var f = e.target.files[0];
+      var reader = new FileReader();
+      reader.onload = function(e) {
+        $('#' + SSL_PRIVATE_KEY_CONTENTS_ID).val(reader.result);
+        $('#' + SSL_PRIVATE_KEY_CONTENTS_ID).attr('data-changed', true);
+        $('[name="' + SSL_PRIVATE_KEY_PATH + '"]').val('');
+        badgeForDifferences($('#' + SSL_PRIVATE_KEY_CONTENTS_ID));
+      }
+      reader.readAsText(f);
+    });
+    $('body').on('change input propertychange', '#' + SSL_CERT_FILE_ID, function(e){
+      var f = e.target.files[0];
+      var reader = new FileReader();
+      reader.onload = function(e) {
+        $('#' + SSL_CERT_CONTENTS_ID).val(reader.result);
+        $('#' + SSL_CERT_CONTENTS_ID).attr('data-changed', true);
+        $('[name="' + SSL_CERT_PATH + '"]').val('');
+        $('#' + SSL_CERT_FINGERPRINT_SPAN_ID).text('');
+        badgeForDifferences($('#' + SSL_CERT_CONTENTS_ID));
+      }
+      reader.readAsText(f);
+    });
+
+    $('body').on('change input propertychange', '[name="' + SSL_PRIVATE_KEY_PATH + '"]', function(e){
+      $('#' + SSL_PRIVATE_KEY_FILE_ID).val('');
+      $('#' + SSL_PRIVATE_KEY_CONTENTS_ID).val('');
+      badgeForDifferences($('[name="' + SSL_PRIVATE_KEY_PATH + '"]').attr('data-changed', true));
+    });
+
+    $('body').on('change input propertychange', '[name="' + SSL_CERT_PATH + '"]', function(e){
+      $('#' + SSL_CERT_FILE_ID).val('');
+      $('#' + SSL_CERT_CONTENTS_ID).val('');
+      $('#' + SSL_CERT_FINGERPRINT_SPAN_ID).text('');
+      badgeForDifferences($('[name="' + SSL_CERT_PATH + '"]').attr('data-changed', true));
+    });
+  }
+
   var RESTORE_SETTINGS_UPLOAD_ID = 'restore-settings-button';
   var RESTORE_SETTINGS_FILE_ID = 'restore-settings-file';
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 09438b31bc..d9c0a0a6b3 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -32,6 +32,7 @@
 #include <AccountManager.h>
 #include <AssetClient.h>
 #include <BuildInfo.h>
+#include <CrashAnnotations.h>
 #include <DependencyManager.h>
 #include <HifiConfigVariantMap.h>
 #include <HTTPConnection.h>
@@ -174,6 +175,9 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     LogUtils::init();
 
+    LogHandler::getInstance().moveToThread(thread());
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     qDebug() << "Setting up domain-server";
     qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
     qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
@@ -182,6 +186,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     qDebug() << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
     qDebug() << "[VERSION] We will be using this name to find ICE servers:" << _iceServerAddr;
 
+    connect(this, &QCoreApplication::aboutToQuit, this, &DomainServer::aboutToQuit);
 
     // make sure we have a fresh AccountManager instance
     // (need this since domain-server can restart itself and maintain static variables)
@@ -226,9 +231,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     setupGroupCacheRefresh();
 
-    // if we were given a certificate/private key or oauth credentials they must succeed
-    if (!(optionallyReadX509KeyAndCertificate() && optionallySetupOAuth())) {
-        return;
+    optionallySetupOAuth();
+
+    if (_oauthEnable) {
+        _oauthEnable = optionallyReadX509KeyAndCertificate();
     }
 
     _settingsManager.apiRefreshGroupInformation();
@@ -319,7 +325,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     connect(_contentManager.get(), &DomainContentBackupManager::recoveryCompleted, this, &DomainServer::restart);
 
-static const int NODE_PING_MONITOR_INTERVAL_MSECS = 1 * MSECS_PER_SECOND;
+    static const int NODE_PING_MONITOR_INTERVAL_MSECS = 1 * MSECS_PER_SECOND;
     _nodePingMonitorTimer = new QTimer{ this };
     connect(_nodePingMonitorTimer, &QTimer::timeout, this, &DomainServer::nodePingMonitor);
     _nodePingMonitorTimer->start(NODE_PING_MONITOR_INTERVAL_MSECS);
@@ -428,6 +434,10 @@ DomainServer::~DomainServer() {
     DependencyManager::destroy<LimitedNodeList>();
 }
 
+void DomainServer::aboutToQuit() {
+    crash::annotations::setShutdownState(true);
+}
+
 void DomainServer::queuedQuit(QString quitMessage, int exitCode) {
     if (!quitMessage.isEmpty()) {
         qWarning() << qPrintable(quitMessage);
@@ -447,8 +457,9 @@ QUuid DomainServer::getID() {
 }
 
 bool DomainServer::optionallyReadX509KeyAndCertificate() {
-    const QString X509_CERTIFICATE_OPTION = "cert";
-    const QString X509_PRIVATE_KEY_OPTION = "key";
+    const QString X509_CERTIFICATE_OPTION = "oauth.cert";
+    const QString X509_PRIVATE_KEY_OPTION = "oauth.key";
+    const QString X509_PRIVATE_KEY_PASSPHRASE_OPTION = "oauth.key-passphrase";
     const QString X509_KEY_PASSPHRASE_ENV = "DOMAIN_SERVER_KEY_PASSPHRASE";
 
     QString certPath = _settingsManager.valueForKeyPath(X509_CERTIFICATE_OPTION).toString();
@@ -459,7 +470,12 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
         // this is used for Oauth callbacks when authorizing users against a data server
         // let's make sure we can load the key and certificate
 
-        QString keyPassphraseString = QProcessEnvironment::systemEnvironment().value(X509_KEY_PASSPHRASE_ENV);
+        QString keyPassphraseEnv = QProcessEnvironment::systemEnvironment().value(X509_KEY_PASSPHRASE_ENV);
+        QString keyPassphraseString = _settingsManager.valueForKeyPath(X509_PRIVATE_KEY_PASSPHRASE_OPTION).toString();
+
+        if (!keyPassphraseEnv.isEmpty()) {
+            keyPassphraseString = keyPassphraseEnv;
+        }
 
         qDebug() << "Reading certificate file at" << certPath << "for HTTPS.";
         qDebug() << "Reading key file at" << keyPath << "for HTTPS.";
@@ -473,16 +489,15 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
         QSslCertificate sslCertificate(&certFile);
         QSslKey privateKey(&keyFile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, keyPassphraseString.toUtf8());
 
+        if (privateKey.isNull()) {
+            qCritical() << "SSL Private Key Not Loading.  Bad password or key format?";
+        }
+
         _httpsManager.reset(new HTTPSManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTPS_PORT, sslCertificate, privateKey, QString(), this));
 
         qDebug() << "TCP server listening for HTTPS connections on" << DOMAIN_SERVER_HTTPS_PORT;
 
     } else if (!certPath.isEmpty() || !keyPath.isEmpty()) {
-        static const QString MISSING_CERT_ERROR_MSG = "Missing certificate or private key. domain-server will now quit.";
-        static const int MISSING_CERT_ERROR_CODE = 3;
-
-        QMetaObject::invokeMethod(this, "queuedQuit", Qt::QueuedConnection,
-                                  Q_ARG(QString, MISSING_CERT_ERROR_MSG), Q_ARG(int, MISSING_CERT_ERROR_CODE));
         return false;
     }
 
@@ -490,10 +505,12 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
 }
 
 bool DomainServer::optionallySetupOAuth() {
-    const QString OAUTH_PROVIDER_URL_OPTION = "oauth-provider";
-    const QString OAUTH_CLIENT_ID_OPTION = "oauth-client-id";
+    const QString OAUTH_ENABLE_OPTION = "oauth.enable";
+    const QString OAUTH_PROVIDER_URL_OPTION = "oauth.provider";
+    const QString OAUTH_CLIENT_ID_OPTION = "oauth.client-id";
     const QString OAUTH_CLIENT_SECRET_ENV = "DOMAIN_SERVER_CLIENT_SECRET";
-    const QString REDIRECT_HOSTNAME_OPTION = "hostname";
+    const QString OAUTH_CLIENT_SECRET_OPTION = "oauth.client-secret";
+    const QString REDIRECT_HOSTNAME_OPTION = "oauth.hostname";
 
     _oauthProviderURL = QUrl(_settingsManager.valueForKeyPath(OAUTH_PROVIDER_URL_OPTION).toString());
 
@@ -502,22 +519,24 @@ bool DomainServer::optionallySetupOAuth() {
         _oauthProviderURL = NetworkingConstants::METAVERSE_SERVER_URL();
     }
 
+    _oauthClientSecret = QProcessEnvironment::systemEnvironment().value(OAUTH_CLIENT_SECRET_ENV);
+    if (_oauthClientSecret.isEmpty()) {
+        _oauthClientSecret = _settingsManager.valueForKeyPath(OAUTH_CLIENT_SECRET_OPTION).toString();
+    }
     auto accountManager = DependencyManager::get<AccountManager>();
     accountManager->setAuthURL(_oauthProviderURL);
 
     _oauthClientID = _settingsManager.valueForKeyPath(OAUTH_CLIENT_ID_OPTION).toString();
-    _oauthClientSecret = QProcessEnvironment::systemEnvironment().value(OAUTH_CLIENT_SECRET_ENV);
     _hostname = _settingsManager.valueForKeyPath(REDIRECT_HOSTNAME_OPTION).toString();
 
-    if (!_oauthClientID.isEmpty()) {
+    _oauthEnable = _settingsManager.valueForKeyPath(OAUTH_ENABLE_OPTION).toBool();
+
+    if (_oauthEnable) {
         if (_oauthProviderURL.isEmpty()
             || _hostname.isEmpty()
             || _oauthClientID.isEmpty()
             || _oauthClientSecret.isEmpty()) {
-            static const QString MISSING_OAUTH_INFO_MSG = "Missing OAuth provider URL, hostname, client ID, or client secret. domain-server will now quit.";
-            static const int MISSING_OAUTH_INFO_ERROR_CODE = 4;
-            QMetaObject::invokeMethod(this, "queuedQuit", Qt::QueuedConnection,
-                                      Q_ARG(QString, MISSING_OAUTH_INFO_MSG), Q_ARG(int, MISSING_OAUTH_INFO_ERROR_CODE));
+            _oauthEnable = false;
             return false;
         } else {
             qDebug() << "OAuth will be used to identify clients using provider at" << _oauthProviderURL.toString();
@@ -1746,8 +1765,8 @@ void DomainServer::nodePingMonitor() {
 }
 
 void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessage> message) {
-    qDebug() << "Received octree data persist message";
     auto data = message->readAll();
+    qDebug() << "Received octree data persist message" << (data.size() / 1000) << "kbytes.";
     auto filePath = getEntitiesFilePath();
 
     QDir dir(getEntitiesDirPath());
@@ -1759,12 +1778,16 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
     QFile f(filePath);
     if (f.open(QIODevice::WriteOnly)) {
         f.write(data);
+#ifdef EXPENSIVE_NETWORK_DIAGNOSTICS
+        // These diagnostics take take more than 200ms (depending on content size),
+        // causing Socket::readPendingDatagrams to overrun its timebox.
         OctreeUtils::RawEntityData entityData;
         if (entityData.readOctreeDataInfoFromData(data)) {
             qCDebug(domain_server) << "Wrote new entities file" << entityData.id << entityData.dataVersion;
         } else {
             qCDebug(domain_server) << "Failed to read new octree data info";
         }
+#endif
     } else {
         qCDebug(domain_server) << "Failed to write new entities file:" << filePath;
     }
@@ -2689,8 +2712,8 @@ void DomainServer::profileRequestFinished() {
 std::pair<bool, QString>  DomainServer::isAuthenticatedRequest(HTTPConnection* connection) {
 
     static const QByteArray HTTP_COOKIE_HEADER_KEY = "Cookie";
-    static const QString ADMIN_USERS_CONFIG_KEY = "admin-users";
-    static const QString ADMIN_ROLES_CONFIG_KEY = "admin-roles";
+    static const QString ADMIN_USERS_CONFIG_KEY = "oauth.admin-users";
+    static const QString ADMIN_ROLES_CONFIG_KEY = "oauth.admin-roles";
     static const QString BASIC_AUTH_USERNAME_KEY_PATH = "security.http_username";
     static const QString BASIC_AUTH_PASSWORD_KEY_PATH = "security.http_password";
     const QString COOKIE_UUID_REGEX_STRING = HIFI_SESSION_COOKIE_KEY + "=([\\d\\w-]+)($|;)";
@@ -2700,8 +2723,7 @@ std::pair<bool, QString>  DomainServer::isAuthenticatedRequest(HTTPConnection* c
     QVariant adminUsersVariant = _settingsManager.valueForKeyPath(ADMIN_USERS_CONFIG_KEY);
     QVariant adminRolesVariant = _settingsManager.valueForKeyPath(ADMIN_ROLES_CONFIG_KEY);
 
-    if (!_oauthProviderURL.isEmpty()
-        && (adminUsersVariant.isValid() || adminRolesVariant.isValid())) {
+    if (_oauthEnable) {
         QString cookieString = connection->requestHeader(HTTP_COOKIE_HEADER_KEY);
 
         QRegExp cookieUUIDRegex(COOKIE_UUID_REGEX_STRING);
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 02362abd7b..c725688b67 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -136,6 +136,8 @@ private slots:
     void tokenGrantFinished();
     void profileRequestFinished();
 
+    void aboutToQuit();
+
 signals:
     void iceServerChanged();
     void userConnected();
@@ -236,6 +238,7 @@ private:
 
     bool _isUsingDTLS { false };
 
+    bool _oauthEnable { false };
     QUrl _oauthProviderURL;
     QString _oauthClientID;
     QString _oauthClientSecret;
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 17d473f02c..73d78a5c70 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -22,7 +22,9 @@
 #include <QtCore/QThread>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
+#include <QtNetwork/QSslKey>
 #include <QSaveFile>
+#include <QPair>
 
 #include <AccountManager.h>
 #include <Assignment.h>
@@ -46,10 +48,14 @@ const QString DESCRIPTION_SETTINGS_KEY = "settings";
 const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
 const QString DESCRIPTION_GROUP_LABEL_KEY = "label";
+const QString DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY = "show_on_enable";
+const QString DESCRIPTION_ENABLE_KEY = "enable";
 const QString DESCRIPTION_BACKUP_FLAG_KEY = "backup";
 const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 const QString DESCRIPTION_COLUMNS_KEY = "columns";
 const QString CONTENT_SETTING_FLAG_KEY = "content_setting";
+static const QString SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY = "domain_settings";
+static const QString SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY = "content_settings";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
@@ -136,6 +142,10 @@ void DomainServerSettingsManager::splitSettingsDescription() {
 
                 settingsDropdownGroup[DESCRIPTION_GROUP_LABEL_KEY] = groupObject[DESCRIPTION_GROUP_LABEL_KEY];
 
+                if (groupObject.contains(DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY)) {
+                    settingsDropdownGroup[DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY] = groupObject[DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY];
+                }
+
                 static const QString DESCRIPTION_GROUP_HTML_ID_KEY = "html_id";
                 if (groupObject.contains(DESCRIPTION_GROUP_HTML_ID_KEY)) {
                     settingsDropdownGroup[DESCRIPTION_GROUP_HTML_ID_KEY] = groupObject[DESCRIPTION_GROUP_HTML_ID_KEY];
@@ -170,9 +180,6 @@ void DomainServerSettingsManager::splitSettingsDescription() {
 
     // populate the settings menu groups with what we've collected
 
-    static const QString SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY = "domain_settings";
-    static const QString SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY = "content_settings";
-
     _settingsMenuGroups[SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY] = domainSettingsMenuGroups;
     _settingsMenuGroups[SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY] = contentSettingsMenuGroups;
 }
@@ -448,6 +455,77 @@ void DomainServerSettingsManager::setupConfigMap(const QString& userConfigFilena
             packPermissions();
         }
 
+        if (oldVersion < 2.4) {
+            // migrate oauth settings to their own group
+            const QString ADMIN_USERS = "admin-users";
+            const QString OAUTH_ADMIN_USERS = "oauth.admin-users";
+            const QString OAUTH_CLIENT_ID = "oauth.client-id";
+            const QString ALT_ADMIN_USERS = "admin.users";
+            const QString ADMIN_ROLES = "admin-roles";
+            const QString OAUTH_ADMIN_ROLES = "oauth.admin-roles";
+            const QString OAUTH_ENABLE = "oauth.enable";
+
+            QVector<QPair<const char*, const char*> > conversionMap = {
+                {"key", "oauth.key"},
+                {"cert", "oauth.cert"},
+                {"hostname", "oauth.hostname"},
+                {"oauth-client-id", "oauth.client-id"},
+                {"oauth-provider", "oauth.provider"}
+            };
+
+            for (auto & conversion : conversionMap) {
+                QVariant* prevValue = _configMap.valueForKeyPath(conversion.first);
+                if (prevValue) {
+                    auto newValue = _configMap.valueForKeyPath(conversion.second, true);
+                    *newValue = *prevValue;
+                }
+            }
+
+            QVariant* client_id = _configMap.valueForKeyPath(OAUTH_CLIENT_ID);
+            if (client_id) {
+                QVariant* oauthEnable = _configMap.valueForKeyPath(OAUTH_ENABLE, true);
+                
+                *oauthEnable = QVariant(true);
+            }
+
+            QVariant* oldAdminUsers = _configMap.valueForKeyPath(ADMIN_USERS);
+            QVariant* newAdminUsers = _configMap.valueForKeyPath(OAUTH_ADMIN_USERS, true);
+            QVariantList adminUsers(newAdminUsers->toList());
+            if (oldAdminUsers) {
+                QStringList adminUsersList = oldAdminUsers->toStringList();
+                for (auto & user : adminUsersList) {
+                    if (!adminUsers.contains(user)) {
+                        adminUsers.append(user);
+                    }
+                }
+            }
+            QVariant* altAdminUsers = _configMap.valueForKeyPath(ALT_ADMIN_USERS);
+            if (altAdminUsers) {
+                QStringList adminUsersList = altAdminUsers->toStringList();
+                for (auto & user : adminUsersList) {
+                    if (!adminUsers.contains(user)) {
+                        adminUsers.append(user);
+                    }
+                }
+            }
+
+            *newAdminUsers = adminUsers;
+
+            QVariant* oldAdminRoles = _configMap.valueForKeyPath(ADMIN_ROLES);
+            QVariant* newAdminRoles = _configMap.valueForKeyPath(OAUTH_ADMIN_ROLES, true);
+            QVariantList adminRoles(newAdminRoles->toList());
+            if (oldAdminRoles) {
+                QStringList adminRoleList = oldAdminRoles->toStringList();
+                for (auto & role : adminRoleList) {
+                    if (!adminRoles.contains(role)) {
+                        adminRoles.append(role);
+                    }
+                }
+            }
+
+            *newAdminRoles = adminRoles;
+        }
+
 
         // write the current description version to our settings
         *versionVariant = _descriptionVersion;
@@ -1185,7 +1263,24 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 
             return true;
         } else if (url.path() == SETTINGS_MENU_GROUPS_PATH) {
-            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(_settingsMenuGroups).toJson(), "application/json");
+
+            QJsonObject settings;
+            for (auto & key : _settingsMenuGroups.keys()) {
+                const QJsonArray& settingGroups = _settingsMenuGroups[key].toArray();
+                QJsonArray groups;
+                foreach (const QJsonValue& group, settingGroups) {
+                    QJsonObject groupObject = group.toObject();
+                    QVariant* enableKey = _configMap.valueForKeyPath(groupObject[DESCRIPTION_NAME_KEY].toString() + "." + DESCRIPTION_ENABLE_KEY);
+
+                    if (!groupObject.contains(DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY)
+                        || (groupObject[DESCRIPTION_GROUP_SHOW_ON_ENABLE_KEY].toBool() && enableKey && enableKey->toBool() )) {
+                        groups.append(groupObject);
+                    }
+                }
+                settings[key] = groups;
+            }
+
+            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(settings).toJson(), "application/json");
 
             return true;
         } else if (url.path() == SETTINGS_BACKUP_PATH) {
@@ -1446,6 +1541,28 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
         }
     }
 
+    // add 'derived' values used primarily for UI
+
+    const QString X509_CERTIFICATE_OPTION = "oauth.cert";
+
+    QString certPath = valueForKeyPath(X509_CERTIFICATE_OPTION).toString();
+    if (!certPath.isEmpty()) {
+        // the user wants to use the following cert and key for HTTPS
+        // this is used for Oauth callbacks when authorizing users against a data server
+        // let's make sure we can load the key and certificate
+
+        qDebug() << "Reading certificate file at" << certPath << "for HTTPS.";
+
+        QFile certFile(certPath);
+        certFile.open(QIODevice::ReadOnly);
+
+        QSslCertificate sslCertificate(&certFile);
+        QString digest = sslCertificate.digest().toHex(':');
+        auto groupObject = responseObject["oauth"].toObject();
+        groupObject["cert-fingerprint"] = digest;
+        responseObject["oauth"] = groupObject;
+    }
+
     return responseObject;
 }
 
@@ -1551,23 +1668,65 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson
     return QJsonObject();
 }
 
-bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
+bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedSettingsObject,
                                                                         SettingsType settingsType) {
 
     // take a write lock since we're about to overwrite settings in the config map
     QWriteLocker locker(&_settingsLock);
 
+    QJsonObject postedObject(postedSettingsObject);
+
     static const QString SECURITY_ROOT_KEY = "security";
     static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist";
     static const QString BROADCASTING_KEY = "broadcasting";
     static const QString WIZARD_KEY = "wizard";
     static const QString DESCRIPTION_ROOT_KEY = "descriptors";
+    static const QString OAUTH_ROOT_KEY = "oauth";
+    static const QString OAUTH_KEY_CONTENTS = "key-contents";
+    static const QString OAUTH_CERT_CONTENTS = "cert-contents";
+    static const QString OAUTH_CERT_PATH = "cert";
+    static const QString OAUTH_KEY_PASSPHRASE = "key-passphrase";
+    static const QString OAUTH_KEY_PATH = "key";
 
     auto& settingsVariant = _configMap.getConfig();
     bool needRestart = false;
 
     auto& filteredDescriptionArray = settingsType == DomainSettings ? _domainSettingsDescription : _contentSettingsDescription;
 
+    auto oauthObject = postedObject[OAUTH_ROOT_KEY].toObject();
+    if (oauthObject.contains(OAUTH_CERT_CONTENTS)) {
+        QSslCertificate cert(oauthObject[OAUTH_CERT_CONTENTS].toString().toUtf8());
+        if (!cert.isNull()) {
+            static const QString CERT_FILE_NAME = "certificate.crt";
+            auto certPath = PathUtils::getAppDataFilePath(CERT_FILE_NAME);
+            QFile file(certPath);
+            if (file.open(QFile::WriteOnly)) {
+                file.write(cert.toPem());
+                file.close();
+            }
+            oauthObject[OAUTH_CERT_PATH] = certPath;
+        }
+        oauthObject.remove(OAUTH_CERT_CONTENTS);
+    }
+    if (oauthObject.contains(OAUTH_KEY_CONTENTS)) {
+        QString keyPassphraseString = oauthObject[OAUTH_KEY_PASSPHRASE].toString();
+        QSslKey key(oauthObject[OAUTH_KEY_CONTENTS].toString().toUtf8(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, keyPassphraseString.toUtf8());
+        if (!key.isNull()) {
+            static const QString KEY_FILE_NAME = "certificate.key";
+            auto keyPath = PathUtils::getAppDataFilePath(KEY_FILE_NAME);
+            QFile file(keyPath);
+            if (file.open(QFile::WriteOnly)) {
+                file.write(key.toPem());
+                file.close();
+                file.setPermissions(QFile::ReadOwner | QFile::WriteOwner);
+            }
+            oauthObject[OAUTH_KEY_PATH] = keyPath;
+        }
+        oauthObject.remove(OAUTH_KEY_CONTENTS);
+    }
+
+    postedObject[OAUTH_ROOT_KEY] = oauthObject;
+
     // Iterate on the setting groups
     foreach(const QString& rootKey, postedObject.keys()) {
         const QJsonValue& rootValue = postedObject[rootKey];
@@ -1752,6 +1911,8 @@ void DomainServerSettingsManager::persistToFile() {
         _configMap.loadConfig();
         return; // defend against future code
     }
+
+    QFile(settingsFilename).setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner);
 }
 
 QStringList DomainServerSettingsManager::getAllKnownGroupNames() {
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 7aea9cc3d4..ba12349347 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -15,9 +15,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <BuildInfo.h>
+#include <CrashAnnotations.h>
 #include <LogHandler.h>
 #include <SharedUtil.h>
-#include <BuildInfo.h>
 
 #include "DomainServer.h"
 
@@ -32,6 +33,7 @@ int main(int argc, char* argv[]) {
 
     // use a do-while to handle domain-server restart
     do {
+        crash::annotations::setShutdownState(false);
         DomainServer domainServer(argc, argv);
         currentExitCode = domainServer.exec();
     } while (currentExitCode == DomainServer::EXIT_CODE_REBOOT);
@@ -39,4 +41,3 @@ int main(int argc, char* argv[]) {
     qInfo() << "Quitting.";
     return currentExitCode;
 }
-
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 9553b571c5..bcd3f269e8 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -70,12 +70,16 @@ file(GLOB_RECURSE INTERFACE_SRCS "src/*.cpp" "src/*.h")
 GroupSources("src")
 list(APPEND INTERFACE_SRCS ${RESOURCES_RCC})
 
+# grab the Objective-C sources on OS X
+if (APPLE)
+  file(GLOB_RECURSE INTERFACE_OBJCPP_SRCS "src/*.m" "src/*.mm")
+  list(APPEND INTERFACE_SRCS ${INTERFACE_OBJCPP_SRCS})
+endif ()
+
 # Add SpeechRecognizer if on Windows or OS X, otherwise remove
 if (WIN32)
   # Use .cpp and .h files as is.
 elseif (APPLE)
-  file(GLOB INTERFACE_OBJCPP_SRCS "src/SpeechRecognizer.mm")
-  set(INTERFACE_SRCS ${INTERFACE_SRCS} ${INTERFACE_OBJCPP_SRCS})
   get_filename_component(SPEECHRECOGNIZER_CPP "src/SpeechRecognizer.cpp" ABSOLUTE)
   list(REMOVE_ITEM INTERFACE_SRCS ${SPEECHRECOGNIZER_CPP})
 else ()
@@ -117,6 +121,7 @@ if (APPLE)
   # configure CMake to use a custom Info.plist
   set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
 
+  set(MACOSX_BUNDLE_BUNDLE_NAME "High Fidelity")
   if (PRODUCTION_BUILD)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface)
   else ()
@@ -151,7 +156,7 @@ elseif (WIN32)
   set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
   configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
 
-  set(APP_FULL_NAME "High Fidelity Interface")
+  set(APP_FULL_NAME "High Fidelity")
   set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
   configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
 
diff --git a/interface/external/iViewHMD/readme.txt b/interface/external/iViewHMD/readme.txt
deleted file mode 100644
index 4b3d59349b..0000000000
--- a/interface/external/iViewHMD/readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Instructions for adding SMI HMD Eye Tracking to Interface on Windows
-David Rowe, 27 Jul 2015.
-
-1.  Download and install the SMI HMD Eye Tracking software from http://update.smivision.com/iViewNG-HMD.exe.
-
-2.  Copy the SDK folders (3rdParty, include, libs) from the SDK installation folder C:\Program Files (x86)\SMI\iViewNG-HMD\SDK 
-    into the interface/externals/iViewHMD folder. This readme.txt should be there as well.
-
-   You may optionally choose to copy the SDK folders to a location outside the repository (so you can re-use with different 
-   checkouts and different projects). If so, set the ENV variable "HIFI_LIB_DIR" to a directory containing a subfolder 
-   "iViewHMD" that contains the folders mentioned above.
-
-3. Clear your build directory, run cmake and build, and you should be all set.
diff --git a/interface/icon/interface-beta.icns b/interface/icon/interface-beta.icns
index 1013607082..8dadfd5037 100644
Binary files a/interface/icon/interface-beta.icns and b/interface/icon/interface-beta.icns differ
diff --git a/interface/icon/interface-beta.ico b/interface/icon/interface-beta.ico
index d04fba6e04..09a97956a7 100644
Binary files a/interface/icon/interface-beta.ico and b/interface/icon/interface-beta.ico differ
diff --git a/interface/icon/interface.icns b/interface/icon/interface.icns
index 4aeb8301ce..8dadfd5037 100644
Binary files a/interface/icon/interface.icns and b/interface/icon/interface.icns differ
diff --git a/interface/icon/interface.ico b/interface/icon/interface.ico
index cdd4792f56..09a97956a7 100644
Binary files a/interface/icon/interface.ico and b/interface/icon/interface.ico differ
diff --git a/interface/interface.entitlements b/interface/interface.entitlements
new file mode 100644
index 0000000000..e41b568d42
--- /dev/null
+++ b/interface/interface.entitlements
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>high-fidelity.hifi</string>
+	</array>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>
diff --git a/interface/resources/avatar/animations/emote_agree_acknowledge.fbx b/interface/resources/avatar/animations/emote_agree_acknowledge.fbx
index 9b1984b7cd..1784e54828 100644
Binary files a/interface/resources/avatar/animations/emote_agree_acknowledge.fbx and b/interface/resources/avatar/animations/emote_agree_acknowledge.fbx differ
diff --git a/interface/resources/avatar/animations/emote_agree_headnod.fbx b/interface/resources/avatar/animations/emote_agree_headnod.fbx
index f380f7887c..dbb46c1c5f 100644
Binary files a/interface/resources/avatar/animations/emote_agree_headnod.fbx and b/interface/resources/avatar/animations/emote_agree_headnod.fbx differ
diff --git a/interface/resources/avatar/animations/emote_agree_headnodyes.fbx b/interface/resources/avatar/animations/emote_agree_headnodyes.fbx
index c8bb90c021..588a305c02 100644
Binary files a/interface/resources/avatar/animations/emote_agree_headnodyes.fbx and b/interface/resources/avatar/animations/emote_agree_headnodyes.fbx differ
diff --git a/interface/resources/avatar/animations/emote_agree_longheadnod.fbx b/interface/resources/avatar/animations/emote_agree_longheadnod.fbx
index 01aa806b77..ab66359775 100644
Binary files a/interface/resources/avatar/animations/emote_agree_longheadnod.fbx and b/interface/resources/avatar/animations/emote_agree_longheadnod.fbx differ
diff --git a/interface/resources/avatar/animations/emote_agree_thoughtfulheadnod.fbx b/interface/resources/avatar/animations/emote_agree_thoughtfulheadnod.fbx
index dcdba0a721..5ca510930d 100644
Binary files a/interface/resources/avatar/animations/emote_agree_thoughtfulheadnod.fbx and b/interface/resources/avatar/animations/emote_agree_thoughtfulheadnod.fbx differ
diff --git a/interface/resources/avatar/animations/emote_clap01_all.fbx b/interface/resources/avatar/animations/emote_clap01_all.fbx
index f04046280b..61cec1c19c 100644
Binary files a/interface/resources/avatar/animations/emote_clap01_all.fbx and b/interface/resources/avatar/animations/emote_clap01_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_clap02_all.fbx b/interface/resources/avatar/animations/emote_clap02_all.fbx
index caf673f28a..ba4db90363 100644
Binary files a/interface/resources/avatar/animations/emote_clap02_all.fbx and b/interface/resources/avatar/animations/emote_clap02_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_clap03_all.fbx b/interface/resources/avatar/animations/emote_clap03_all.fbx
index c214bce859..e04f656610 100644
Binary files a/interface/resources/avatar/animations/emote_clap03_all.fbx and b/interface/resources/avatar/animations/emote_clap03_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_disagree_annoyedheadshake.fbx b/interface/resources/avatar/animations/emote_disagree_annoyedheadshake.fbx
index 3d7b61a468..976c72ba85 100644
Binary files a/interface/resources/avatar/animations/emote_disagree_annoyedheadshake.fbx and b/interface/resources/avatar/animations/emote_disagree_annoyedheadshake.fbx differ
diff --git a/interface/resources/avatar/animations/emote_disagree_drophead.fbx b/interface/resources/avatar/animations/emote_disagree_drophead.fbx
index 39ffa7e591..68899e6e90 100644
Binary files a/interface/resources/avatar/animations/emote_disagree_drophead.fbx and b/interface/resources/avatar/animations/emote_disagree_drophead.fbx differ
diff --git a/interface/resources/avatar/animations/emote_disagree_thoughtfulheadshake.fbx b/interface/resources/avatar/animations/emote_disagree_thoughtfulheadshake.fbx
index c25a717c4a..17691b8dc7 100644
Binary files a/interface/resources/avatar/animations/emote_disagree_thoughtfulheadshake.fbx and b/interface/resources/avatar/animations/emote_disagree_thoughtfulheadshake.fbx differ
diff --git a/interface/resources/avatar/animations/emote_point01_aimoffsets.fbx b/interface/resources/avatar/animations/emote_point01_aimoffsets.fbx
new file mode 100644
index 0000000000..84524168e7
Binary files /dev/null and b/interface/resources/avatar/animations/emote_point01_aimoffsets.fbx differ
diff --git a/interface/resources/avatar/animations/emote_point01_all.fbx b/interface/resources/avatar/animations/emote_point01_all.fbx
index 8fe7c951d6..6302620794 100644
Binary files a/interface/resources/avatar/animations/emote_point01_all.fbx and b/interface/resources/avatar/animations/emote_point01_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_raisehand01_all.fbx b/interface/resources/avatar/animations/emote_raisehand01_all.fbx
index 3206ffe411..85f57014d1 100644
Binary files a/interface/resources/avatar/animations/emote_raisehand01_all.fbx and b/interface/resources/avatar/animations/emote_raisehand01_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_raisehand03_all.fbx b/interface/resources/avatar/animations/emote_raisehand03_all.fbx
index fe9d9ca4b7..6de262c1ac 100644
Binary files a/interface/resources/avatar/animations/emote_raisehand03_all.fbx and b/interface/resources/avatar/animations/emote_raisehand03_all.fbx differ
diff --git a/interface/resources/avatar/animations/emote_raisehand04_all.fbx b/interface/resources/avatar/animations/emote_raisehand04_all.fbx
index 01caf1a7af..262ba1badb 100644
Binary files a/interface/resources/avatar/animations/emote_raisehand04_all.fbx and b/interface/resources/avatar/animations/emote_raisehand04_all.fbx differ
diff --git a/interface/resources/avatar/animations/fly.fbx b/interface/resources/avatar/animations/fly.fbx
index 5d8fcce23b..5f0fa1ecd7 100644
Binary files a/interface/resources/avatar/animations/fly.fbx and b/interface/resources/avatar/animations/fly.fbx differ
diff --git a/interface/resources/avatar/animations/idle.fbx b/interface/resources/avatar/animations/idle.fbx
index a2cbb9b43b..e5a08ec600 100644
Binary files a/interface/resources/avatar/animations/idle.fbx and b/interface/resources/avatar/animations/idle.fbx differ
diff --git a/interface/resources/avatar/animations/idle02.fbx b/interface/resources/avatar/animations/idle02.fbx
index c18162dda1..7ec151ac21 100644
Binary files a/interface/resources/avatar/animations/idle02.fbx and b/interface/resources/avatar/animations/idle02.fbx differ
diff --git a/interface/resources/avatar/animations/idle03.fbx b/interface/resources/avatar/animations/idle03.fbx
index 5349c49a31..641659cc17 100644
Binary files a/interface/resources/avatar/animations/idle03.fbx and b/interface/resources/avatar/animations/idle03.fbx differ
diff --git a/interface/resources/avatar/animations/idle04.fbx b/interface/resources/avatar/animations/idle04.fbx
index c0676a7980..8207b7eaeb 100644
Binary files a/interface/resources/avatar/animations/idle04.fbx and b/interface/resources/avatar/animations/idle04.fbx differ
diff --git a/interface/resources/avatar/animations/idleWS_all.fbx b/interface/resources/avatar/animations/idleWS_all.fbx
index 3605ecfcf4..d56b6f578b 100644
Binary files a/interface/resources/avatar/animations/idleWS_all.fbx and b/interface/resources/avatar/animations/idleWS_all.fbx differ
diff --git a/interface/resources/avatar/animations/idle_LFF_all.fbx b/interface/resources/avatar/animations/idle_LFF_all.fbx
index 66b82914ba..416bba001e 100644
Binary files a/interface/resources/avatar/animations/idle_LFF_all.fbx and b/interface/resources/avatar/animations/idle_LFF_all.fbx differ
diff --git a/interface/resources/avatar/animations/idle_RFF_all.fbx b/interface/resources/avatar/animations/idle_RFF_all.fbx
index 80277ec9a6..925e6ad4f9 100644
Binary files a/interface/resources/avatar/animations/idle_RFF_all.fbx and b/interface/resources/avatar/animations/idle_RFF_all.fbx differ
diff --git a/interface/resources/avatar/animations/idle_aimoffsets.fbx b/interface/resources/avatar/animations/idle_aimoffsets.fbx
new file mode 100644
index 0000000000..6e5ab05fdc
Binary files /dev/null and b/interface/resources/avatar/animations/idle_aimoffsets.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_fidget.fbx b/interface/resources/avatar/animations/idle_once_fidget.fbx
index 2270614901..af5d6167a7 100644
Binary files a/interface/resources/avatar/animations/idle_once_fidget.fbx and b/interface/resources/avatar/animations/idle_once_fidget.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_headtilt.fbx b/interface/resources/avatar/animations/idle_once_headtilt.fbx
index eeae4604aa..f6bd8fe770 100644
Binary files a/interface/resources/avatar/animations/idle_once_headtilt.fbx and b/interface/resources/avatar/animations/idle_once_headtilt.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_lookaround.fbx b/interface/resources/avatar/animations/idle_once_lookaround.fbx
index b638191654..cf793b55b5 100644
Binary files a/interface/resources/avatar/animations/idle_once_lookaround.fbx and b/interface/resources/avatar/animations/idle_once_lookaround.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_lookleftright.fbx b/interface/resources/avatar/animations/idle_once_lookleftright.fbx
index 72aee7931e..c8e9516cc9 100644
Binary files a/interface/resources/avatar/animations/idle_once_lookleftright.fbx and b/interface/resources/avatar/animations/idle_once_lookleftright.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_neckstretch.fbx b/interface/resources/avatar/animations/idle_once_neckstretch.fbx
index 5ee4a99d65..8eaa5f337b 100644
Binary files a/interface/resources/avatar/animations/idle_once_neckstretch.fbx and b/interface/resources/avatar/animations/idle_once_neckstretch.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_shiftheelpivot.fbx b/interface/resources/avatar/animations/idle_once_shiftheelpivot.fbx
index 073b4343aa..79ce27ab89 100644
Binary files a/interface/resources/avatar/animations/idle_once_shiftheelpivot.fbx and b/interface/resources/avatar/animations/idle_once_shiftheelpivot.fbx differ
diff --git a/interface/resources/avatar/animations/idle_once_slownod.fbx b/interface/resources/avatar/animations/idle_once_slownod.fbx
index 7a27add7bf..23f93a3978 100644
Binary files a/interface/resources/avatar/animations/idle_once_slownod.fbx and b/interface/resources/avatar/animations/idle_once_slownod.fbx differ
diff --git a/interface/resources/avatar/animations/jog_bwd.fbx b/interface/resources/avatar/animations/jog_bwd.fbx
index b3eb8c919d..2f52d3a71e 100644
Binary files a/interface/resources/avatar/animations/jog_bwd.fbx and b/interface/resources/avatar/animations/jog_bwd.fbx differ
diff --git a/interface/resources/avatar/animations/jog_fwd.fbx b/interface/resources/avatar/animations/jog_fwd.fbx
index 9d38caacab..784482445a 100644
Binary files a/interface/resources/avatar/animations/jog_fwd.fbx and b/interface/resources/avatar/animations/jog_fwd.fbx differ
diff --git a/interface/resources/avatar/animations/jog_left.fbx b/interface/resources/avatar/animations/jog_left.fbx
index 7732050201..a875da6d69 100644
Binary files a/interface/resources/avatar/animations/jog_left.fbx and b/interface/resources/avatar/animations/jog_left.fbx differ
diff --git a/interface/resources/avatar/animations/jog_right.fbx b/interface/resources/avatar/animations/jog_right.fbx
index 9b419b6eec..e3b0f379cd 100644
Binary files a/interface/resources/avatar/animations/jog_right.fbx and b/interface/resources/avatar/animations/jog_right.fbx differ
diff --git a/interface/resources/avatar/animations/jump_running_launch_land_all.fbx b/interface/resources/avatar/animations/jump_running_launch_land_all.fbx
index 71dae6bcc5..4d17a6b72a 100644
Binary files a/interface/resources/avatar/animations/jump_running_launch_land_all.fbx and b/interface/resources/avatar/animations/jump_running_launch_land_all.fbx differ
diff --git a/interface/resources/avatar/animations/jump_standing_apex_all.fbx b/interface/resources/avatar/animations/jump_standing_apex_all.fbx
index 5d5873c39a..bd52dfad0d 100644
Binary files a/interface/resources/avatar/animations/jump_standing_apex_all.fbx and b/interface/resources/avatar/animations/jump_standing_apex_all.fbx differ
diff --git a/interface/resources/avatar/animations/jump_standing_land_settle_all.fbx b/interface/resources/avatar/animations/jump_standing_land_settle_all.fbx
index ef8e83be34..e371f36022 100644
Binary files a/interface/resources/avatar/animations/jump_standing_land_settle_all.fbx and b/interface/resources/avatar/animations/jump_standing_land_settle_all.fbx differ
diff --git a/interface/resources/avatar/animations/jump_standing_launch_all.fbx b/interface/resources/avatar/animations/jump_standing_launch_all.fbx
index e10e428579..e75c85431b 100644
Binary files a/interface/resources/avatar/animations/jump_standing_launch_all.fbx and b/interface/resources/avatar/animations/jump_standing_launch_all.fbx differ
diff --git a/interface/resources/avatar/animations/run_bwd.fbx b/interface/resources/avatar/animations/run_bwd.fbx
index 60ade1f2ac..95cfe695f4 100644
Binary files a/interface/resources/avatar/animations/run_bwd.fbx and b/interface/resources/avatar/animations/run_bwd.fbx differ
diff --git a/interface/resources/avatar/animations/run_fast_fwd.fbx b/interface/resources/avatar/animations/run_fast_fwd.fbx
index cb964d57d8..c227428985 100644
Binary files a/interface/resources/avatar/animations/run_fast_fwd.fbx and b/interface/resources/avatar/animations/run_fast_fwd.fbx differ
diff --git a/interface/resources/avatar/animations/run_fast_left.fbx b/interface/resources/avatar/animations/run_fast_left.fbx
index 5078d0cb22..40ab6220df 100644
Binary files a/interface/resources/avatar/animations/run_fast_left.fbx and b/interface/resources/avatar/animations/run_fast_left.fbx differ
diff --git a/interface/resources/avatar/animations/run_fast_right.fbx b/interface/resources/avatar/animations/run_fast_right.fbx
index ddf081bef6..dde651d18d 100644
Binary files a/interface/resources/avatar/animations/run_fast_right.fbx and b/interface/resources/avatar/animations/run_fast_right.fbx differ
diff --git a/interface/resources/avatar/animations/settle_to_idle_small.fbx b/interface/resources/avatar/animations/settle_to_idle_small.fbx
index 3d79d1930c..9161a95d95 100644
Binary files a/interface/resources/avatar/animations/settle_to_idle_small.fbx and b/interface/resources/avatar/animations/settle_to_idle_small.fbx differ
diff --git a/interface/resources/avatar/animations/side_step_left.fbx b/interface/resources/avatar/animations/side_step_left.fbx
index b74fe9074a..ee1169b8ad 100644
Binary files a/interface/resources/avatar/animations/side_step_left.fbx and b/interface/resources/avatar/animations/side_step_left.fbx differ
diff --git a/interface/resources/avatar/animations/side_step_left_fast.fbx b/interface/resources/avatar/animations/side_step_left_fast.fbx
index f4c997345f..a00949d749 100644
Binary files a/interface/resources/avatar/animations/side_step_left_fast.fbx and b/interface/resources/avatar/animations/side_step_left_fast.fbx differ
diff --git a/interface/resources/avatar/animations/side_step_short_left.fbx b/interface/resources/avatar/animations/side_step_short_left.fbx
index 8f55364b17..f3b4091420 100644
Binary files a/interface/resources/avatar/animations/side_step_short_left.fbx and b/interface/resources/avatar/animations/side_step_short_left.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_agree_acknowledge.fbx b/interface/resources/avatar/animations/sitting_emote_agree_acknowledge.fbx
new file mode 100644
index 0000000000..368228ff4e
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_agree_acknowledge.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_agree_cheer.fbx b/interface/resources/avatar/animations/sitting_emote_agree_cheer.fbx
new file mode 100644
index 0000000000..74bd63f52d
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_agree_cheer.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_agree_headnod.fbx b/interface/resources/avatar/animations/sitting_emote_agree_headnod.fbx
index 655608fe55..ad72d31881 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_agree_headnod.fbx and b/interface/resources/avatar/animations/sitting_emote_agree_headnod.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_agree_headnodyes.fbx b/interface/resources/avatar/animations/sitting_emote_agree_headnodyes.fbx
index cfe90c45f0..2b24011b99 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_agree_headnodyes.fbx and b/interface/resources/avatar/animations/sitting_emote_agree_headnodyes.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_agree_longheadnod.fbx b/interface/resources/avatar/animations/sitting_emote_agree_longheadnod.fbx
index ead3a29fe6..43b160f96a 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_agree_longheadnod.fbx and b/interface/resources/avatar/animations/sitting_emote_agree_longheadnod.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_clap02_all.fbx b/interface/resources/avatar/animations/sitting_emote_clap02_all.fbx
new file mode 100644
index 0000000000..685af598a0
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_clap02_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_clap03_all.fbx b/interface/resources/avatar/animations/sitting_emote_clap03_all.fbx
new file mode 100644
index 0000000000..c7ae67149e
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_clap03_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_clap_all.fbx b/interface/resources/avatar/animations/sitting_emote_clap_all.fbx
index 947ef4541a..09b09e0101 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_clap_all.fbx and b/interface/resources/avatar/animations/sitting_emote_clap_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_disagree_disbelief.fbx b/interface/resources/avatar/animations/sitting_emote_disagree_disbelief.fbx
new file mode 100644
index 0000000000..ad1a63019f
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_disagree_disbelief.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_disagree_dismiss.fbx b/interface/resources/avatar/animations/sitting_emote_disagree_dismiss.fbx
new file mode 100644
index 0000000000..9dbc57bb24
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_disagree_dismiss.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_disagree_drophead.fbx b/interface/resources/avatar/animations/sitting_emote_disagree_drophead.fbx
index 239b242aab..daf847bdf5 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_disagree_drophead.fbx and b/interface/resources/avatar/animations/sitting_emote_disagree_drophead.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_disagree_headshake.fbx b/interface/resources/avatar/animations/sitting_emote_disagree_headshake.fbx
index 7c6f90ee89..fa7c55d535 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_disagree_headshake.fbx and b/interface/resources/avatar/animations/sitting_emote_disagree_headshake.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_point_aimoffsets.fbx b/interface/resources/avatar/animations/sitting_emote_point_aimoffsets.fbx
new file mode 100644
index 0000000000..eb31091a94
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_point_aimoffsets.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_point_all.fbx b/interface/resources/avatar/animations/sitting_emote_point_all.fbx
index f850c8e9b3..455f8861b2 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_point_all.fbx and b/interface/resources/avatar/animations/sitting_emote_point_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_raisehand02_all.fbx b/interface/resources/avatar/animations/sitting_emote_raisehand02_all.fbx
new file mode 100644
index 0000000000..48c21e32bc
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_raisehand02_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_raisehand03_all.fbx b/interface/resources/avatar/animations/sitting_emote_raisehand03_all.fbx
new file mode 100644
index 0000000000..c6be3a3129
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_emote_raisehand03_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_emote_raisehand_all.fbx b/interface/resources/avatar/animations/sitting_emote_raisehand_all.fbx
index 7f1b2efea2..f60f49b2fc 100644
Binary files a/interface/resources/avatar/animations/sitting_emote_raisehand_all.fbx and b/interface/resources/avatar/animations/sitting_emote_raisehand_all.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_idle.fbx b/interface/resources/avatar/animations/sitting_idle.fbx
index 63496f4673..877ce024d2 100644
Binary files a/interface/resources/avatar/animations/sitting_idle.fbx and b/interface/resources/avatar/animations/sitting_idle.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_idle02.fbx b/interface/resources/avatar/animations/sitting_idle02.fbx
new file mode 100644
index 0000000000..8cf3d22fc6
Binary files /dev/null and b/interface/resources/avatar/animations/sitting_idle02.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_idle03.fbx b/interface/resources/avatar/animations/sitting_idle03.fbx
index 17bba40cd7..0dee5b128d 100644
Binary files a/interface/resources/avatar/animations/sitting_idle03.fbx and b/interface/resources/avatar/animations/sitting_idle03.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_talk02.fbx b/interface/resources/avatar/animations/sitting_talk02.fbx
index 7e6a071c0e..9742e69489 100644
Binary files a/interface/resources/avatar/animations/sitting_talk02.fbx and b/interface/resources/avatar/animations/sitting_talk02.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_talk03.fbx b/interface/resources/avatar/animations/sitting_talk03.fbx
index 73dff2e900..8e0d45e954 100644
Binary files a/interface/resources/avatar/animations/sitting_talk03.fbx and b/interface/resources/avatar/animations/sitting_talk03.fbx differ
diff --git a/interface/resources/avatar/animations/sitting_talk04.fbx b/interface/resources/avatar/animations/sitting_talk04.fbx
index ee920672fa..6738e88b1d 100644
Binary files a/interface/resources/avatar/animations/sitting_talk04.fbx and b/interface/resources/avatar/animations/sitting_talk04.fbx differ
diff --git a/interface/resources/avatar/animations/talk.fbx b/interface/resources/avatar/animations/talk.fbx
index 6cc34049be..133a16641a 100644
Binary files a/interface/resources/avatar/animations/talk.fbx and b/interface/resources/avatar/animations/talk.fbx differ
diff --git a/interface/resources/avatar/animations/talk02.fbx b/interface/resources/avatar/animations/talk02.fbx
index a502ff261b..de30b7e9fe 100644
Binary files a/interface/resources/avatar/animations/talk02.fbx and b/interface/resources/avatar/animations/talk02.fbx differ
diff --git a/interface/resources/avatar/animations/talk03.fbx b/interface/resources/avatar/animations/talk03.fbx
index da95717540..9bcad7b4af 100644
Binary files a/interface/resources/avatar/animations/talk03.fbx and b/interface/resources/avatar/animations/talk03.fbx differ
diff --git a/interface/resources/avatar/animations/talk04.fbx b/interface/resources/avatar/animations/talk04.fbx
index 9e5505b969..2fb1811405 100644
Binary files a/interface/resources/avatar/animations/talk04.fbx and b/interface/resources/avatar/animations/talk04.fbx differ
diff --git a/interface/resources/avatar/animations/talk_armsdown.fbx b/interface/resources/avatar/animations/talk_armsdown.fbx
index e069811f7c..66d69e70e1 100644
Binary files a/interface/resources/avatar/animations/talk_armsdown.fbx and b/interface/resources/avatar/animations/talk_armsdown.fbx differ
diff --git a/interface/resources/avatar/animations/talk_lefthand.fbx b/interface/resources/avatar/animations/talk_lefthand.fbx
index d7fd1d5e07..08299fd14b 100644
Binary files a/interface/resources/avatar/animations/talk_lefthand.fbx and b/interface/resources/avatar/animations/talk_lefthand.fbx differ
diff --git a/interface/resources/avatar/animations/talk_righthand.fbx b/interface/resources/avatar/animations/talk_righthand.fbx
index 332afcc1e7..99dd70e308 100644
Binary files a/interface/resources/avatar/animations/talk_righthand.fbx and b/interface/resources/avatar/animations/talk_righthand.fbx differ
diff --git a/interface/resources/avatar/animations/teleport.fbx b/interface/resources/avatar/animations/teleport.fbx
index 99c950ced6..eeeb48596b 100644
Binary files a/interface/resources/avatar/animations/teleport.fbx and b/interface/resources/avatar/animations/teleport.fbx differ
diff --git a/interface/resources/avatar/animations/turn_left.fbx b/interface/resources/avatar/animations/turn_left.fbx
index b7cadf7a66..a58036499d 100644
Binary files a/interface/resources/avatar/animations/turn_left.fbx and b/interface/resources/avatar/animations/turn_left.fbx differ
diff --git a/interface/resources/avatar/animations/turn_right.fbx b/interface/resources/avatar/animations/turn_right.fbx
index 4ee3d52daf..c28ac2a62f 100644
Binary files a/interface/resources/avatar/animations/turn_right.fbx and b/interface/resources/avatar/animations/turn_right.fbx differ
diff --git a/interface/resources/avatar/animations/walk_bwd.fbx b/interface/resources/avatar/animations/walk_bwd.fbx
index 9daa769885..786ad67db9 100644
Binary files a/interface/resources/avatar/animations/walk_bwd.fbx and b/interface/resources/avatar/animations/walk_bwd.fbx differ
diff --git a/interface/resources/avatar/animations/walk_bwd_fast.fbx b/interface/resources/avatar/animations/walk_bwd_fast.fbx
index af22d0d0b0..cc872d7f09 100644
Binary files a/interface/resources/avatar/animations/walk_bwd_fast.fbx and b/interface/resources/avatar/animations/walk_bwd_fast.fbx differ
diff --git a/interface/resources/avatar/animations/walk_fwd.fbx b/interface/resources/avatar/animations/walk_fwd.fbx
index f86a8744c9..d128b4228e 100644
Binary files a/interface/resources/avatar/animations/walk_fwd.fbx and b/interface/resources/avatar/animations/walk_fwd.fbx differ
diff --git a/interface/resources/avatar/animations/walk_fwd_fast.fbx b/interface/resources/avatar/animations/walk_fwd_fast.fbx
index 8d2becf4b8..b387b237d3 100644
Binary files a/interface/resources/avatar/animations/walk_fwd_fast.fbx and b/interface/resources/avatar/animations/walk_fwd_fast.fbx differ
diff --git a/interface/resources/avatar/animations/walk_left.fbx b/interface/resources/avatar/animations/walk_left.fbx
index f35d4f6a77..a492c79e06 100644
Binary files a/interface/resources/avatar/animations/walk_left.fbx and b/interface/resources/avatar/animations/walk_left.fbx differ
diff --git a/interface/resources/avatar/animations/walk_left_fast.fbx b/interface/resources/avatar/animations/walk_left_fast.fbx
index 8414ee6805..7c502aae82 100644
Binary files a/interface/resources/avatar/animations/walk_left_fast.fbx and b/interface/resources/avatar/animations/walk_left_fast.fbx differ
diff --git a/interface/resources/avatar/animations/walk_right.fbx b/interface/resources/avatar/animations/walk_right.fbx
index 5fe005f96c..03c9705b3d 100644
Binary files a/interface/resources/avatar/animations/walk_right.fbx and b/interface/resources/avatar/animations/walk_right.fbx differ
diff --git a/interface/resources/avatar/animations/walk_right_fast.fbx b/interface/resources/avatar/animations/walk_right_fast.fbx
index 37b7bbbb62..5453399fd6 100644
Binary files a/interface/resources/avatar/animations/walk_right_fast.fbx and b/interface/resources/avatar/animations/walk_right_fast.fbx differ
diff --git a/interface/resources/avatar/animations/walk_short_fwd.fbx b/interface/resources/avatar/animations/walk_short_fwd.fbx
index b52371869b..63a44138e0 100644
Binary files a/interface/resources/avatar/animations/walk_short_fwd.fbx and b/interface/resources/avatar/animations/walk_short_fwd.fbx differ
diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json
index 0131829471..fa3a020b23 100644
--- a/interface/resources/avatar/avatar-animation.json
+++ b/interface/resources/avatar/avatar-animation.json
@@ -588,976 +588,6 @@
                                                                                         "children": [
                                                                                             {
                                                                                                 "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 271,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/sitting_talk02.fbx"
-                                                                                                                },
-                                                                                                                "id": "seatedTalk02",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 252,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/sitting_talk03.fbx"
-                                                                                                                },
-                                                                                                                "id": "seatedTalk03",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 442,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 0,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/sitting_talk04.fbx"
-                                                                                                                },
-                                                                                                                "id": "seatedTalk04",
-                                                                                                                "type": "clip"
-                                                                                                            }
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "currentState": "seatedTalk02",
-                                                                                                            "randomSwitchTimeMax": 12,
-                                                                                                            "randomSwitchTimeMin": 7,
-                                                                                                            "states": [
-                                                                                                                {
-                                                                                                                    "id": "seatedTalk02",
-                                                                                                                    "interpDuration": 6,
-                                                                                                                    "interpTarget": 6,
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "seatedTalk03",
-                                                                                                                    "interpDuration": 6,
-                                                                                                                    "interpTarget": 6,
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "seatedTalk04",
-                                                                                                                    "interpDuration": 6,
-                                                                                                                    "interpTarget": 6,
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        "id": "seatedTalk",
-                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 800,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/sitting_idle.fbx"
-                                                                                                                },
-                                                                                                                "id": "seatedIdle01",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 800,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/sitting_idle03.fbx"
-                                                                                                                },
-                                                                                                                "id": "seatedIdle03",
-                                                                                                                "type": "clip"
-                                                                                                            }
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "currentState": "seatedIdle01",
-                                                                                                            "randomSwitchTimeMax": 20,
-                                                                                                            "randomSwitchTimeMin": 10,
-                                                                                                            "states": [
-                                                                                                                {
-                                                                                                                    "id": "seatedIdle01",
-                                                                                                                    "interpDuration": 6,
-                                                                                                                    "interpTarget": 6,
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "seatedIdle03",
-                                                                                                                    "interpDuration": 6,
-                                                                                                                    "interpTarget": 6,
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        "id": "seatedIdle",
-                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "alpha": 1,
-                                                                                                    "alphaVar": "talkOverlayAlpha",
-                                                                                                    "boneSet": "upperBody"
-                                                                                                },
-                                                                                                "id": "seatedTalkOverlay",
-                                                                                                "type": "overlay"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 44,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_agree_headnod.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPositiveHeadNod",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 78,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_agree_headnodyes.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPositiveHeadNodYes",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 65,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_agree_longheadnod.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPositiveLongHeadNod",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "seatedReactionPositiveHeadNod",
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": false,
-                                                                                                    "randomSwitchTimeMax": 12,
-                                                                                                    "randomSwitchTimeMin": 7,
-                                                                                                    "startFrame": 0,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "id": "seatedReactionPositiveHeadNod",
-                                                                                                            "interpDuration": 6,
-                                                                                                            "interpTarget": 6,
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "id": "seatedReactionPositiveHeadNodYes",
-                                                                                                            "interpDuration": 6,
-                                                                                                            "interpTarget": 6,
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "id": "seatedReactionPositiveLongHeadNod",
-                                                                                                            "interpDuration": 6,
-                                                                                                            "interpTarget": 6,
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "timeScale": 1,
-                                                                                                    "triggerRandomSwitch": "",
-                                                                                                    "url": "qrc:///avatar/animations/sitting_idle.fbx"
-                                                                                                },
-                                                                                                "id": "seatedReactionPositive",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 64,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 0,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_disagree_headshake.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionNegativeDisagreeHeadshake",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 158,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 0,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_disagree_drophead.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionNegativeDisagreeDropHead",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "seatedReactionNegativeDisagreeHeadshake",
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": false,
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "startFrame": 0,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionNegativeDisagreeHeadshake",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionNegativeDisagreeDropHead",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "timeScale": 1,
-                                                                                                    "triggerRandomSwitch": "",
-                                                                                                    "url": "qrc:///avatar/animations/sitting_idle.fbx"
-                                                                                                },
-                                                                                                "id": "seatedReactionNegative",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 32,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 0,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionRaiseHandIntro",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 345,
-                                                                                                            "loopFlag": true,
-                                                                                                            "startFrame": 32,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionRaiseHandLoop",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 400,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 345,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionRaiseHandOutro",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "seatedReactionRaiseHandIntro",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionRaiseHandIntro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionRaiseHandLoop",
-                                                                                                                    "var": "seatedReactionRaiseHandIntroOnDone"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "id": "seatedReactionRaiseHandLoop",
-                                                                                                            "interpDuration": 5,
-                                                                                                            "interpTarget": 5,
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionRaiseHandOutro",
-                                                                                                                    "var": "reactionRaiseHandDisabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionRaiseHandOutro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionRaiseHandLoop",
-                                                                                                                    "var": "reactionRaiseHandEnabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "triggerRandomSwitch": ""
-                                                                                                },
-                                                                                                "id": "seatedReactionRaiseHand",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 12,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 0,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionApplaudIntro",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 76,
-                                                                                                            "loopFlag": true,
-                                                                                                            "startFrame": 12,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionApplaudLoop",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 99,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 76,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionApplaudOutro",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "seatedReactionApplaudIntro",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionApplaudIntro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionApplaudLoop",
-                                                                                                                    "var": "seatedReactionApplaudIntroOnDone"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionApplaudLoop",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionApplaudOutro",
-                                                                                                                    "var": "reactionApplaudDisabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionApplaudOutro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionApplaudLoop",
-                                                                                                                    "var": "reactionApplaudEnabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "triggerRandomSwitch": ""
-                                                                                                },
-                                                                                                "id": "seatedReactionApplaud",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 22,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPointIntro",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 43,
-                                                                                                            "loopFlag": true,
-                                                                                                            "startFrame": 22,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPointLoop",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 71,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 43,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "seatedReactionPointOutro",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "seatedReactionPointIntro",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionPointIntro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionPointLoop",
-                                                                                                                    "var": "seatedReactionPointIntroOnDone"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionPointLoop",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionPointOutro",
-                                                                                                                    "var": "reactionPointDisabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "seatedReactionPointOutro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "seatedReactionPointLoop",
-                                                                                                                    "var": "reactionPointEnabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "triggerRandomSwitch": ""
-                                                                                                },
-                                                                                                "id": "seatedReactionPoint",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "currentState": "seatedTalkOverlay",
-                                                                                            "states": [
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedTalkOverlay",
-                                                                                                    "interpDuration": 15,
-                                                                                                    "interpTarget": 15,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedReactionPositive",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "seatedReactionPositiveHeadNodOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "seatedReactionPositiveHeadNodYesOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "seatedReactionPositiveLongHeadNodOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedReactionNegative",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "seatedReactionNegativeDisagreeHeadshakeOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "seatedReactionNegativeDisagreeDropHeadOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedReactionRaiseHand",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedReactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "reactionRaiseHandDisabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedReactionApplaud",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedReactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "reactionApplaudDisabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "seatedReactionPoint",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
-                                                                                                    "transitions": [
-                                                                                                        {
-                                                                                                            "state": "seatedReactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedReactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "seatedTalkOverlay",
-                                                                                                            "var": "reactionPointDisabled"
-                                                                                                        }
-                                                                                                    ]
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        "id": "seated",
-                                                                                        "type": "stateMachine"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 500,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 325,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk02.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk02",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 300,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk03.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk03",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 500,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk04.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk04",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 215,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk_armsdown.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk_armsdown",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 500,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk_lefthand.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk_lefthand",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 502,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 1,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/talk_righthand.fbx"
-                                                                                                                },
-                                                                                                                "id": "talk_righthand",
-                                                                                                                "type": "clip"
-                                                                                                            }
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "currentState": "talk",
-                                                                                                            "randomSwitchTimeMax": 12,
-                                                                                                            "randomSwitchTimeMin": 7,
-                                                                                                            "states": [
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk02",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk03",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk04",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk_armsdown",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk_lefthand",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "talk_righthand",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0.33,
-                                                                                                                    "resume": true,
-                                                                                                                    "transitions": [
-                                                                                                                    ]
-                                                                                                                }
-                                                                                                            ],
-                                                                                                            "triggerRandomSwitch": "idleTalkSwitch"
-                                                                                                        },
-                                                                                                        "id": "idleTalk",
-                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                    },
                                                                                                     {
                                                                                                         "children": [
                                                                                                             {
@@ -1566,26 +596,99 @@
                                                                                                                         "children": [
                                                                                                                         ],
                                                                                                                         "data": {
-                                                                                                                            "endFrame": 300,
+                                                                                                                            "endFrame": 271,
                                                                                                                             "loopFlag": true,
                                                                                                                             "startFrame": 1,
                                                                                                                             "timeScale": 1,
-                                                                                                                            "url": "qrc:///avatar/animations/idle.fbx"
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_talk02.fbx"
                                                                                                                         },
-                                                                                                                        "id": "masterIdle1",
+                                                                                                                        "id": "seatedTalk02",
                                                                                                                         "type": "clip"
                                                                                                                     },
                                                                                                                     {
                                                                                                                         "children": [
                                                                                                                         ],
                                                                                                                         "data": {
-                                                                                                                            "endFrame": 400,
+                                                                                                                            "endFrame": 252,
                                                                                                                             "loopFlag": true,
                                                                                                                             "startFrame": 1,
-                                                                                                                            "timeScale": 0.75,
-                                                                                                                            "url": "qrc:///avatar/animations/idle02.fbx"
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_talk03.fbx"
                                                                                                                         },
-                                                                                                                        "id": "masterIdle2",
+                                                                                                                        "id": "seatedTalk03",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 442,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 0,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_talk04.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedTalk04",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "seatedTalk02",
+                                                                                                                    "randomSwitchTimeMax": 12,
+                                                                                                                    "randomSwitchTimeMin": 7,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "seatedTalk02",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "seatedTalk03",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "seatedTalk04",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": "seatedTalkSwitch"
+                                                                                                                },
+                                                                                                                "id": "seatedTalk",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 800,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 0,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_idle.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedIdle01",
                                                                                                                         "type": "clip"
                                                                                                                     },
                                                                                                                     {
@@ -1594,893 +697,207 @@
                                                                                                                         "data": {
                                                                                                                             "endFrame": 800,
                                                                                                                             "loopFlag": true,
-                                                                                                                            "startFrame": 1,
+                                                                                                                            "startFrame": 0,
                                                                                                                             "timeScale": 1,
-                                                                                                                            "url": "qrc:///avatar/animations/idle03.fbx"
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_idle02.fbx"
                                                                                                                         },
-                                                                                                                        "id": "masterIdle3",
+                                                                                                                        "id": "seatedIdle02",
                                                                                                                         "type": "clip"
                                                                                                                     },
                                                                                                                     {
                                                                                                                         "children": [
                                                                                                                         ],
                                                                                                                         "data": {
-                                                                                                                            "endFrame": 902,
+                                                                                                                            "endFrame": 800,
                                                                                                                             "loopFlag": true,
-                                                                                                                            "startFrame": 1,
+                                                                                                                            "startFrame": 0,
                                                                                                                             "timeScale": 1,
-                                                                                                                            "url": "qrc:///avatar/animations/idle04.fbx"
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_idle03.fbx"
                                                                                                                         },
-                                                                                                                        "id": "masterIdle4",
+                                                                                                                        "id": "seatedIdle03",
                                                                                                                         "type": "clip"
                                                                                                                     }
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "currentState": "masterIdle1",
-                                                                                                                    "randomSwitchTimeMax": 30,
+                                                                                                                    "currentState": "seatedIdle01",
+                                                                                                                    "randomSwitchTimeMax": 20,
                                                                                                                     "randomSwitchTimeMin": 10,
                                                                                                                     "states": [
                                                                                                                         {
                                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                                            "id": "masterIdle1",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
+                                                                                                                            "id": "seatedIdle01",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
                                                                                                                             "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.25,
+                                                                                                                            "priority": 1,
                                                                                                                             "resume": true,
                                                                                                                             "transitions": [
                                                                                                                             ]
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                                            "id": "masterIdle2",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
+                                                                                                                            "id": "seatedIdle02",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
                                                                                                                             "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.25,
+                                                                                                                            "priority": 1,
                                                                                                                             "resume": true,
                                                                                                                             "transitions": [
                                                                                                                             ]
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                                            "id": "masterIdle3",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
+                                                                                                                            "id": "seatedIdle03",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
                                                                                                                             "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.25,
-                                                                                                                            "resume": true,
-                                                                                                                            "transitions": [
-                                                                                                                            ]
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                                            "id": "masterIdle4",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
-                                                                                                                            "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.25,
+                                                                                                                            "priority": 1,
                                                                                                                             "resume": true,
                                                                                                                             "transitions": [
                                                                                                                             ]
                                                                                                                         }
                                                                                                                     ],
-                                                                                                                    "triggerRandomSwitch": "masterIdleSwitch"
+                                                                                                                    "triggerRandomSwitch": "seatedIdleSwitch"
                                                                                                                 },
-                                                                                                                "id": "masterIdle",
-                                                                                                                "type": "randomSwitchStateMachine"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                    {
-                                                                                                                        "children": [
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 91,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_slownod.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_slownod",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 154,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_headtilt.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_headtilt",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 491,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_shiftheelpivot.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_shiftheelpivot",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 1620,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 0.7,
-                                                                                                                                    "url": "qrc:///avatar/animations/idleWS_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idleWS_all",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 324,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_lookaround.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_lookaround",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 169,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_neckstretch.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_neckstretch",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 375,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 0.7,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_lookleftright.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_lookleftright",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 429,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_once_fidget.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "idle_once_fidget",
-                                                                                                                                "type": "clip"
-                                                                                                                            }
-                                                                                                                        ],
-                                                                                                                        "data": {
-                                                                                                                            "currentState": "idle_once_slownod",
-                                                                                                                            "states": [
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_slownod",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_headtilt",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_shiftheelpivot",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idleWS_all",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_lookaround",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_neckstretch",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_lookleftright",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "idle_once_fidget",
-                                                                                                                                    "interpDuration": 15,
-                                                                                                                                    "interpTarget": 15,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.2,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                }
-                                                                                                                            ]
-                                                                                                                        },
-                                                                                                                        "id": "movement",
-                                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                                    },
-                                                                                                                    {
-                                                                                                                        "children": [
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 80,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "startFrameVar": "",
-                                                                                                                                    "timeScale": 0.65,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "transitionToAltIdle1",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 80,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 1,
-                                                                                                                                    "timeScale": 0.65,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "transitionToAltIdle2",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 388,
-                                                                                                                                    "loopFlag": true,
-                                                                                                                                    "startFrame": 80,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "altIdle1",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 388,
-                                                                                                                                    "loopFlag": true,
-                                                                                                                                    "startFrame": 80,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "altIdle2",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 472,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 388,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "alt1ToMasterIdle",
-                                                                                                                                "type": "clip"
-                                                                                                                            },
-                                                                                                                            {
-                                                                                                                                "children": [
-                                                                                                                                ],
-                                                                                                                                "data": {
-                                                                                                                                    "endFrame": 453,
-                                                                                                                                    "loopFlag": false,
-                                                                                                                                    "startFrame": 388,
-                                                                                                                                    "timeScale": 1,
-                                                                                                                                    "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
-                                                                                                                                },
-                                                                                                                                "id": "alt2ToMasterIdle",
-                                                                                                                                "type": "clip"
-                                                                                                                            }
-                                                                                                                        ],
-                                                                                                                        "data": {
-                                                                                                                            "currentState": "transitionToAltIdle1",
-                                                                                                                            "states": [
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "transitionToAltIdle1",
-                                                                                                                                    "interpDuration": 20,
-                                                                                                                                    "interpTarget": 20,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.5,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                        {
-                                                                                                                                            "randomSwitchState": "altIdle1",
-                                                                                                                                            "var": "transitionToAltIdle1OnDone"
-                                                                                                                                        }
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "transitionToAltIdle2",
-                                                                                                                                    "interpDuration": 20,
-                                                                                                                                    "interpTarget": 20,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": 0.5,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                        {
-                                                                                                                                            "randomSwitchState": "altIdle2",
-                                                                                                                                            "var": "transitionToAltIdle2OnDone"
-                                                                                                                                        }
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "altIdle1",
-                                                                                                                                    "interpDuration": 1,
-                                                                                                                                    "interpTarget": 1,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": -1,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                        {
-                                                                                                                                            "randomSwitchState": "alt1ToMasterIdle",
-                                                                                                                                            "var": "finishAltIdle2"
-                                                                                                                                        }
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "altIdle2",
-                                                                                                                                    "interpDuration": 1,
-                                                                                                                                    "interpTarget": 1,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": -1,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                        {
-                                                                                                                                            "randomSwitchState": "alt2ToMasterIdle",
-                                                                                                                                            "var": "finishAltIdle2"
-                                                                                                                                        }
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "alt1ToMasterIdle",
-                                                                                                                                    "interpDuration": 24,
-                                                                                                                                    "interpTarget": 24,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": -1,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                },
-                                                                                                                                {
-                                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                                    "id": "alt2ToMasterIdle",
-                                                                                                                                    "interpDuration": 24,
-                                                                                                                                    "interpTarget": 24,
-                                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                                    "priority": -1,
-                                                                                                                                    "resume": false,
-                                                                                                                                    "transitions": [
-                                                                                                                                    ]
-                                                                                                                                }
-                                                                                                                            ],
-                                                                                                                            "transitionVar": "finishAltIdle2",
-                                                                                                                            "triggerTimeMax": 60,
-                                                                                                                            "triggerTimeMin": 10
-                                                                                                                        },
-                                                                                                                        "id": "alternateIdle",
-                                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                                    }
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "currentState": "movement",
-                                                                                                                    "states": [
-                                                                                                                        {
-                                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                                            "id": "movement",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
-                                                                                                                            "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.6,
-                                                                                                                            "resume": false,
-                                                                                                                            "transitions": [
-                                                                                                                            ]
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                                            "id": "alternateIdle",
-                                                                                                                            "interpDuration": 30,
-                                                                                                                            "interpTarget": 30,
-                                                                                                                            "interpType": "evaluateBoth",
-                                                                                                                            "priority": 0.4,
-                                                                                                                            "resume": false,
-                                                                                                                            "transitions": [
-                                                                                                                            ]
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                "id": "fidget",
+                                                                                                                "id": "seatedIdle",
                                                                                                                 "type": "randomSwitchStateMachine"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "masterIdle",
-                                                                                                            "states": [
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "masterIdle",
-                                                                                                                    "interpDuration": 30,
-                                                                                                                    "interpTarget": 30,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "fidget",
-                                                                                                                            "var": "timeToFidget"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "fidget",
-                                                                                                                    "interpDuration": 15,
-                                                                                                                    "interpTarget": 15,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": -1,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_slownodOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_headtiltOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_shiftheelpivotOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idleWS_allOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_lookaroundOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_neckstretchOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_lookleftrightOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "idle_once_fidgetOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "alt1ToMasterIdleOnDone"
-                                                                                                                        },
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "masterIdle",
-                                                                                                                            "var": "alt2ToMasterIdleOnDone"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                }
-                                                                                                            ],
-                                                                                                            "transitionVar": "timeToFidget",
-                                                                                                            "triggerTimeMax": 50,
-                                                                                                            "triggerTimeMin": 10
+                                                                                                            "alpha": 1,
+                                                                                                            "alphaVar": "talkOverlayAlpha",
+                                                                                                            "boneSet": "upperBody"
                                                                                                         },
-                                                                                                        "id": "idleStand",
-                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "alpha": 1,
-                                                                                                    "alphaVar": "talkOverlayAlpha",
-                                                                                                    "boneSet": "upperBody"
-                                                                                                },
-                                                                                                "id": "idleTalkOverlay",
-                                                                                                "type": "overlay"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 58,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_agree_acknowledge.fbx"
-                                                                                                        },
-                                                                                                        "id": "positiveAcknowledge",
-                                                                                                        "type": "clip"
+                                                                                                        "id": "seatedTalkOverlay",
+                                                                                                        "type": "overlay"
                                                                                                     },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 55,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_agree_headnod.fbx"
-                                                                                                        },
-                                                                                                        "id": "positiveHeadNod",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 78,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_agree_headnodyes.fbx"
-                                                                                                        },
-                                                                                                        "id": "positiveHeadNodYes",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 66,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_agree_longheadnod.fbx"
-                                                                                                        },
-                                                                                                        "id": "positiveLongHeadNod",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 85,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_agree_thoughtfulheadnod.fbx"
-                                                                                                        },
-                                                                                                        "id": "positiveThoughtfulHeadNod",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "positiveAcknowledge",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "positiveAcknowledge",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "positiveHeadNod",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "positiveHeadNodYes",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "positiveLongHeadNod",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "positiveThoughtfulHeadNod",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0.33,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ],
-                                                                                                    "triggerRandomSwitch": ""
-                                                                                                },
-                                                                                                "id": "reactionPositive",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 72,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_disagree_annoyedheadshake.fbx"
-                                                                                                        },
-                                                                                                        "id": "negativeAnnoyedHeadshake",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 92,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_disagree_thoughtfulheadshake.fbx"
-                                                                                                        },
-                                                                                                        "id": "negativeThoughtfulHeadshake",
-                                                                                                        "type": "clip"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 158,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_disagree_drophead.fbx"
-                                                                                                        },
-                                                                                                        "id": "negativeDropHead",
-                                                                                                        "type": "clip"
-                                                                                                    }
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "currentState": "negativeAnnoyedHeadshake",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "negativeAnnoyedHeadshake",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "negativeThoughtfulHeadshake",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "negativeDropHead",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                            ]
-                                                                                                        }
-                                                                                                    ]
-                                                                                                },
-                                                                                                "id": "reactionNegative",
-                                                                                                "type": "randomSwitchStateMachine"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
                                                                                                     {
                                                                                                         "children": [
                                                                                                             {
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 18,
+                                                                                                                    "endFrame": 44,
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_agree_headnod.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand01Intro",
+                                                                                                                "id": "seatedReactionPositiveHeadNod",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 378,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 18,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "raiseHand01Loop",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 435,
+                                                                                                                    "endFrame": 78,
                                                                                                                     "loopFlag": false,
-                                                                                                                    "startFrame": 378,
+                                                                                                                    "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_agree_headnodyes.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand01Outro",
+                                                                                                                "id": "seatedReactionPositiveHeadNodYes",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 65,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_agree_longheadnod.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionPositiveLongHeadNod",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 78,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_agree_cheer.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionPositiveCheer",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 64,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_agree_acknowledge.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionPositiveAcknowledge",
                                                                                                                 "type": "clip"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "raiseHand01Intro",
-                                                                                                            "randomSwitchTimeMax": 10,
-                                                                                                            "randomSwitchTimeMin": 1,
+                                                                                                            "currentState": "seatedReactionPositiveHeadNod",
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": false,
+                                                                                                            "randomSwitchTimeMax": 12,
+                                                                                                            "randomSwitchTimeMin": 7,
+                                                                                                            "startFrame": 0,
                                                                                                             "states": [
                                                                                                                 {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "raiseHand01Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
-                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "id": "seatedReactionPositiveHeadNod",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand01Loop",
-                                                                                                                            "var": "raiseHand01IntroOnDone"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 },
                                                                                                                 {
-                                                                                                                    "id": "raiseHand01Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand01Outro",
-                                                                                                                            "var": "reactionRaiseHandDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "raiseHand01Outro",
+                                                                                                                    "id": "seatedReactionPositiveHeadNodYes",
                                                                                                                     "interpDuration": 1,
                                                                                                                     "interpTarget": 1,
-                                                                                                                    "priority": 0,
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "id": "seatedReactionPositiveLongHeadNod",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "id": "seatedReactionPositiveCheer",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "id": "seatedReactionPositiveAcknowledge",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand01Loop",
-                                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 }
                                                                                                             ],
-                                                                                                            "triggerRandomSwitch": ""
+                                                                                                            "timeScale": 1,
+                                                                                                            "triggerRandomSwitch": "",
+                                                                                                            "url": "qrc:///avatar/animations/sitting_idle.fbx"
                                                                                                         },
-                                                                                                        "id": "raiseHand01",
+                                                                                                        "id": "seatedReactionPositive",
                                                                                                         "type": "randomSwitchStateMachine"
                                                                                                     },
                                                                                                     {
@@ -2489,92 +906,113 @@
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 19,
+                                                                                                                    "endFrame": 64,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_disagree_headshake.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionNegativeDisagreeHeadshake",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 99,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_disagree_drophead.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionNegativeDisagreeDropHead",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 124,
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_disagree_disbelief.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand03Intro",
+                                                                                                                "id": "seatedReactionNegativeDisagreeDisbelief",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 237,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 19,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "raiseHand03Loop",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 300,
+                                                                                                                    "endFrame": 70,
                                                                                                                     "loopFlag": false,
-                                                                                                                    "startFrame": 237,
+                                                                                                                    "startFrame": 0,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_disagree_dismiss.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand03Outro",
+                                                                                                                "id": "seatedReactionNegativeDisagreeDismiss",
                                                                                                                 "type": "clip"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "raiseHand03Intro",
+                                                                                                            "currentState": "seatedReactionNegativeDisagreeHeadshake",
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": false,
                                                                                                             "randomSwitchTimeMax": 10,
                                                                                                             "randomSwitchTimeMin": 1,
+                                                                                                            "startFrame": 0,
                                                                                                             "states": [
                                                                                                                 {
                                                                                                                     "easingType": "easeInOutQuad",
-                                                                                                                    "id": "raiseHand03Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
+                                                                                                                    "id": "seatedReactionNegativeDisagreeHeadshake",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "interpType": "evaluateBoth",
                                                                                                                     "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand03Loop",
-                                                                                                                            "var": "raiseHand03IntroOnDone"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 },
                                                                                                                 {
-                                                                                                                    "id": "raiseHand03Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand03Outro",
-                                                                                                                            "var": "reactionRaiseHandDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "raiseHand03Outro",
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionNegativeDisagreeDropHead",
                                                                                                                     "interpDuration": 1,
                                                                                                                     "interpTarget": 1,
-                                                                                                                    "priority": 0,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionNegativeDisagreeDisbelief",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionNegativeDisagreeDismiss",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand03Loop",
-                                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 }
                                                                                                             ],
-                                                                                                            "triggerRandomSwitch": ""
+                                                                                                            "timeScale": 1,
+                                                                                                            "triggerRandomSwitch": "",
+                                                                                                            "url": "qrc:///avatar/animations/sitting_idle.fbx"
                                                                                                         },
-                                                                                                        "id": "raiseHand03",
+                                                                                                        "id": "seatedReactionNegative",
                                                                                                         "type": "randomSwitchStateMachine"
                                                                                                     },
                                                                                                     {
@@ -2585,11 +1023,11 @@
                                                                                                                 "data": {
                                                                                                                     "endFrame": 32,
                                                                                                                     "loopFlag": false,
-                                                                                                                    "startFrame": 1,
+                                                                                                                    "startFrame": 0,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand04Intro",
+                                                                                                                "id": "seatedReactionRaiseHandIntro",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
@@ -2600,9 +1038,9 @@
                                                                                                                     "loopFlag": true,
                                                                                                                     "startFrame": 32,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand04Loop",
+                                                                                                                "id": "seatedReactionRaiseHandLoop",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
@@ -2613,54 +1051,222 @@
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 345,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand_all.fbx"
                                                                                                                 },
-                                                                                                                "id": "raiseHand04Outro",
+                                                                                                                "id": "seatedReactionRaiseHandOutro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 18,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand02Intro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 378,
+                                                                                                                    "loopFlag": true,
+                                                                                                                    "startFrame": 18,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand02Loop",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 435,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 378,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand02Outro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 15,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand03Intro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 233,
+                                                                                                                    "loopFlag": true,
+                                                                                                                    "mirrorFlag": false,
+                                                                                                                    "startFrame": 15,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand03Loop",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 296,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "mirrorFlag": false,
+                                                                                                                    "startFrame": 233,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_raisehand03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionRaiseHand03Outro",
                                                                                                                 "type": "clip"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "raiseHand04Intro",
+                                                                                                            "currentState": "seatedReactionRaiseHandIntro",
                                                                                                             "randomSwitchTimeMax": 10,
                                                                                                             "randomSwitchTimeMin": 1,
                                                                                                             "states": [
                                                                                                                 {
                                                                                                                     "easingType": "easeInOutQuad",
-                                                                                                                    "id": "raiseHand04Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
+                                                                                                                    "id": "seatedReactionRaiseHandIntro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 9,
                                                                                                                     "interpType": "evaluateBoth",
                                                                                                                     "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
                                                                                                                         {
-                                                                                                                            "randomSwitchState": "raiseHand04Loop",
-                                                                                                                            "var": "raiseHand04IntroOnDone"
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHandLoop",
+                                                                                                                            "var": "seatedReactionRaiseHandIntroOnDone"
                                                                                                                         }
                                                                                                                     ]
                                                                                                                 },
                                                                                                                 {
-                                                                                                                    "id": "raiseHand04Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "raiseHand04Outro",
-                                                                                                                            "var": "reactionRaiseHandDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "raiseHand04Outro",
+                                                                                                                    "id": "seatedReactionRaiseHandLoop",
                                                                                                                     "interpDuration": 1,
                                                                                                                     "interpTarget": 1,
                                                                                                                     "priority": 0,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
                                                                                                                         {
-                                                                                                                            "randomSwitchState": "raiseHand04Loop",
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHandOutro",
+                                                                                                                            "var": "reactionRaiseHandDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionRaiseHandOutro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHandLoop",
+                                                                                                                            "var": "reactionRaiseHandEnabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionRaiseHand02Intro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 8,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand02Loop",
+                                                                                                                            "var": "seatedReactionRaiseHand02IntroOnDone"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "id": "seatedReactionRaiseHand02Loop",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand02Outro",
+                                                                                                                            "var": "reactionRaiseHandDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionRaiseHand02Outro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand02Loop",
+                                                                                                                            "var": "reactionRaiseHandEnabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionRaiseHand03Intro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 8,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand03Loop",
+                                                                                                                            "var": "seatedReactionRaiseHand03IntroOnDone"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "id": "seatedReactionRaiseHand03Loop",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand03Outro",
+                                                                                                                            "var": "reactionRaiseHandDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionRaiseHand03Outro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionRaiseHand03Loop",
                                                                                                                             "var": "reactionRaiseHandEnabled"
                                                                                                                         }
                                                                                                                     ]
@@ -2668,52 +1274,773 @@
                                                                                                             ],
                                                                                                             "triggerRandomSwitch": ""
                                                                                                         },
-                                                                                                        "id": "raiseHand04",
+                                                                                                        "id": "seatedReactionRaiseHand",
                                                                                                         "type": "randomSwitchStateMachine"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 12,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaudIntro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 76,
+                                                                                                                    "loopFlag": true,
+                                                                                                                    "startFrame": 12,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaudLoop",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 99,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 76,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaudOutro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 12,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud02Intro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 112,
+                                                                                                                    "loopFlag": true,
+                                                                                                                    "startFrame": 12,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud02Loop",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 132,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 112,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap02_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud02Outro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 17,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 0,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud03Intro",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 111,
+                                                                                                                    "loopFlag": true,
+                                                                                                                    "startFrame": 17,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud03Loop",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 136,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 111,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_clap03_all.fbx"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionApplaud03Outro",
+                                                                                                                "type": "clip"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "currentState": "seatedReactionApplaudIntro",
+                                                                                                            "randomSwitchTimeMax": 10,
+                                                                                                            "randomSwitchTimeMin": 1,
+                                                                                                            "states": [
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaudIntro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 8,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaudLoop",
+                                                                                                                            "var": "seatedReactionApplaudIntroOnDone"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaudLoop",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaudOutro",
+                                                                                                                            "var": "reactionApplaudDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaudOutro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaudLoop",
+                                                                                                                            "var": "reactionApplaudEnabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud02Intro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 8,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud02Loop",
+                                                                                                                            "var": "seatedReactionApplaud02IntroOnDone"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud02Loop",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud02Outro",
+                                                                                                                            "var": "reactionApplaudDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud02Outro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud02Loop",
+                                                                                                                            "var": "reactionApplaudEnabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud03Intro",
+                                                                                                                    "interpDuration": 8,
+                                                                                                                    "interpTarget": 8,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud03Loop",
+                                                                                                                            "var": "seatedReactionApplaud03IntroOnDone"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud03Loop",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud03Outro",
+                                                                                                                            "var": "reactionApplaudDisabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "seatedReactionApplaud03Outro",
+                                                                                                                    "interpDuration": 12,
+                                                                                                                    "interpTarget": 12,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                        {
+                                                                                                                            "randomSwitchState": "seatedReactionApplaud03Loop",
+                                                                                                                            "var": "reactionApplaudEnabled"
+                                                                                                                        }
+                                                                                                                    ]
+                                                                                                                }
+                                                                                                            ],
+                                                                                                            "triggerRandomSwitch": ""
+                                                                                                        },
+                                                                                                        "id": "seatedReactionApplaud",
+                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [ 
+                                                                                                            {
+                                                                                                                "children": [                                                                                                            
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 21,
+                                                                                                                                    "loopFlag": false,
+                                                                                                                                    "startFrame": 1,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "seatedReactionPointIntro",
+                                                                                                                                "type": "clip"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 100,
+                                                                                                                                    "loopFlag": true,
+                                                                                                                                    "startFrame": 21,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "seatedReactionPointLoop",
+                                                                                                                                "type": "clip"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 134,
+                                                                                                                                    "loopFlag": false,
+                                                                                                                                    "mirrorFlag": false,
+                                                                                                                                    "startFrame": 100,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/sitting_emote_point_all.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "seatedReactionPointOutro",
+                                                                                                                                "type": "clip"
+                                                                                                                            }
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "currentState": "seatedReactionPointIntro",
+                                                                                                                            "randomSwitchTimeMax": 10,
+                                                                                                                            "randomSwitchTimeMin": 1,
+                                                                                                                            "states": [
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "seatedReactionPointIntro",
+                                                                                                                                    "interpDuration": 18,
+                                                                                                                                    "interpTarget": 18,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 1,
+                                                                                                                                    "resume": false,
+                                                                                                                                    "transitions": [
+                                                                                                                                        {
+                                                                                                                                            "randomSwitchState": "seatedReactionPointLoop",
+                                                                                                                                            "var": "seatedReactionPointIntroOnDone"
+                                                                                                                                        }
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "seatedReactionPointLoop",
+                                                                                                                                    "interpDuration": 18,
+                                                                                                                                    "interpTarget": 18,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0,
+                                                                                                                                    "resume": false,
+                                                                                                                                    "transitions": [
+                                                                                                                                        {
+                                                                                                                                            "randomSwitchState": "seatedReactionPointOutro",
+                                                                                                                                            "var": "reactionPointDisabled"
+                                                                                                                                        }
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "seatedReactionPointOutro",
+                                                                                                                                    "interpDuration": 18,
+                                                                                                                                    "interpTarget": 18,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0,
+                                                                                                                                    "resume": false,
+                                                                                                                                    "transitions": [
+                                                                                                                                        {
+                                                                                                                                            "randomSwitchState": "seatedReactionPointLoop",
+                                                                                                                                            "var": "reactionPointEnabled"
+                                                                                                                                        }
+                                                                                                                                    ]
+                                                                                                                                }
+                                                                                                                            ],
+                                                                                                                            "triggerRandomSwitch": ""
+                                                                                                                        },
+                                                                                                                        "id": "seatedReactionPoint",
+                                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "alpha": 0,
+                                                                                                                    "alphaVar": "seatedPointBlendAlpha",
+                                                                                                                    "blendType": "addAbsolute"
+                                                                                                                },
+                                                                                                                "id": "seatedReactionPointBase",
+                                                                                                                "type": "blendLinear" 
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 11,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 11,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 30,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 30,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 50,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 50,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointUp",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 70,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 70,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointDown",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 90,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 90,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointUpLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 110,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 110,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointUpRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 130,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 130,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointDownLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 150,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 150,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointDownRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 3,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 3,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/sitting_emote_point_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "seatedPointCenter",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "alpha": [
+                                                                                                                        0,
+                                                                                                                        0,
+                                                                                                                        0
+                                                                                                                    ],
+                                                                                                                    "alphaVar": "pointAroundAlpha",
+                                                                                                                    "centerId": "seatedPointCenter",
+                                                                                                                    "downId": "seatedPointDown",
+                                                                                                                    "downLeftId": "seatedPointDownLeft",
+                                                                                                                    "downRightId": "seatedPointDownRight",
+                                                                                                                    "leftId": "seatedPointLeft",
+                                                                                                                    "rightId": "seatedPointRight",
+                                                                                                                    "upId": "seatedPointUp",
+                                                                                                                    "upLeftId": "seatedPointUpLeft",
+                                                                                                                    "upRightId": "seatedPointUpRight"
+                                                                                                                },
+                                                                                                                "id": "seatedPointAround",
+                                                                                                                "type": "blendDirectional"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "alpha": 0,
+                                                                                                            "alphaVar": "pointBlendAlpha",
+                                                                                                            "blendType": "addAbsolute"
+                                                                                                        },
+                                                                                                        "id": "seatedReactionPoint",
+                                                                                                        "type": "blendLinear"
                                                                                                     }
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "currentState": "raiseHand01",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                    "currentState": "seatedTalkOverlay",
                                                                                                     "states": [
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "raiseHand01",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
+                                                                                                            "id": "seatedTalkOverlay",
+                                                                                                            "interpDuration": 25,
+                                                                                                            "interpTarget": 25,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         },
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "raiseHand03",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
+                                                                                                            "id": "seatedReactionPositive",
+                                                                                                            "interpDuration": 12,
+                                                                                                            "interpTarget": 12,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionPositiveHeadNodOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionPositiveHeadNodYesOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionPositiveLongHeadNodOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionPositiveCheerOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionPositiveAcknowledgeOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         },
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "raiseHand04",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
+                                                                                                            "id": "seatedReactionNegative",
+                                                                                                            "interpDuration": 12,
+                                                                                                            "interpTarget": 12,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionNegativeDisagreeHeadshakeOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionNegativeDisagreeDropHeadOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionNegativeDisagreeDisbeliefOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "seatedReactionNegativeDisagreeDismissOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "seatedReactionRaiseHand",
+                                                                                                            "interpDuration": 12,
+                                                                                                            "interpTarget": 12,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "reactionRaiseHandDisabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "seatedReactionApplaud",
+                                                                                                            "interpDuration": 12,
+                                                                                                            "interpTarget": 12,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "reactionApplaudDisabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "seatedReactionPoint",
+                                                                                                            "interpDuration": 12,
+                                                                                                            "interpTarget": 12,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedReactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "seatedTalkOverlay",
+                                                                                                                    "var": "reactionPointDisabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         }
                                                                                                     ]
                                                                                                 },
-                                                                                                "id": "reactionRaiseHand",
-                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                "id": "seated",
+                                                                                                "type": "stateMachine"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
@@ -2721,95 +2048,928 @@
                                                                                                         "children": [
                                                                                                             {
                                                                                                                 "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 500,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 325,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk02.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk02",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 300,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk03.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk03",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 500,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk04.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk04",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 215,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk_armsdown.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk_armsdown",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 500,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk_lefthand.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk_lefthand",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 502,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/talk_righthand.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "talk_righthand",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 18,
+                                                                                                                    "currentState": "talk",
+                                                                                                                    "randomSwitchTimeMax": 12,
+                                                                                                                    "randomSwitchTimeMin": 7,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk02",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk03",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk04",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk_armsdown",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk_lefthand",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "talk_righthand",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0.33,
+                                                                                                                            "resume": true,
+                                                                                                                            "transitions": [
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": "idleTalkSwitch"
+                                                                                                                },
+                                                                                                                "id": "idleTalk",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 300,
+                                                                                                                                    "loopFlag": true,
+                                                                                                                                    "startFrame": 1,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/idle.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "masterIdle1",
+                                                                                                                                "type": "clip"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 400,
+                                                                                                                                    "loopFlag": true,
+                                                                                                                                    "startFrame": 1,
+                                                                                                                                    "timeScale": 0.75,
+                                                                                                                                    "url": "qrc:///avatar/animations/idle02.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "masterIdle2",
+                                                                                                                                "type": "clip"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 800,
+                                                                                                                                    "loopFlag": true,
+                                                                                                                                    "startFrame": 1,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/idle03.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "masterIdle3",
+                                                                                                                                "type": "clip"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "endFrame": 902,
+                                                                                                                                    "loopFlag": true,
+                                                                                                                                    "startFrame": 1,
+                                                                                                                                    "timeScale": 1,
+                                                                                                                                    "url": "qrc:///avatar/animations/idle04.fbx"
+                                                                                                                                },
+                                                                                                                                "id": "masterIdle4",
+                                                                                                                                "type": "clip"
+                                                                                                                            }
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "currentState": "masterIdle1",
+                                                                                                                            "randomSwitchTimeMax": 30,
+                                                                                                                            "randomSwitchTimeMin": 10,
+                                                                                                                            "states": [
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "masterIdle1",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.25,
+                                                                                                                                    "resume": true,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "masterIdle2",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.25,
+                                                                                                                                    "resume": true,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "masterIdle3",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.25,
+                                                                                                                                    "resume": true,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "masterIdle4",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.25,
+                                                                                                                                    "resume": true,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                }
+                                                                                                                            ],
+                                                                                                                            "triggerRandomSwitch": "masterIdleSwitch"
+                                                                                                                        },
+                                                                                                                        "id": "masterIdle",
+                                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 91,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_slownod.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_slownod",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 154,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_headtilt.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_headtilt",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 491,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_shiftheelpivot.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_shiftheelpivot",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 1620,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 0.7,
+                                                                                                                                            "url": "qrc:///avatar/animations/idleWS_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idleWS_all",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 324,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_lookaround.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_lookaround",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 169,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_neckstretch.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_neckstretch",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 375,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 0.7,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_lookleftright.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_lookleftright",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 429,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_once_fidget.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "idle_once_fidget",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    }
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "currentState": "idle_once_slownod",
+                                                                                                                                    "states": [
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_slownod",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_headtilt",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_shiftheelpivot",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idleWS_all",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_lookaround",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_neckstretch",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_lookleftright",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "idle_once_fidget",
+                                                                                                                                            "interpDuration": 15,
+                                                                                                                                            "interpTarget": 15,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.2,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        }
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                "id": "movement",
+                                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                                            },
+                                                                                                                            {
+                                                                                                                                "children": [
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 80,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "startFrameVar": "",
+                                                                                                                                            "timeScale": 0.65,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "transitionToAltIdle1",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 80,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 1,
+                                                                                                                                            "timeScale": 0.65,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "transitionToAltIdle2",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 388,
+                                                                                                                                            "loopFlag": true,
+                                                                                                                                            "startFrame": 80,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "altIdle1",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 388,
+                                                                                                                                            "loopFlag": true,
+                                                                                                                                            "startFrame": 80,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "altIdle2",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 472,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 388,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_LFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "alt1ToMasterIdle",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    },
+                                                                                                                                    {
+                                                                                                                                        "children": [
+                                                                                                                                        ],
+                                                                                                                                        "data": {
+                                                                                                                                            "endFrame": 453,
+                                                                                                                                            "loopFlag": false,
+                                                                                                                                            "startFrame": 388,
+                                                                                                                                            "timeScale": 1,
+                                                                                                                                            "url": "qrc:///avatar/animations/idle_RFF_all.fbx"
+                                                                                                                                        },
+                                                                                                                                        "id": "alt2ToMasterIdle",
+                                                                                                                                        "type": "clip"
+                                                                                                                                    }
+                                                                                                                                ],
+                                                                                                                                "data": {
+                                                                                                                                    "currentState": "transitionToAltIdle1",
+                                                                                                                                    "states": [
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "transitionToAltIdle1",
+                                                                                                                                            "interpDuration": 20,
+                                                                                                                                            "interpTarget": 20,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.5,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                                {
+                                                                                                                                                    "randomSwitchState": "altIdle1",
+                                                                                                                                                    "var": "transitionToAltIdle1OnDone"
+                                                                                                                                                }
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "transitionToAltIdle2",
+                                                                                                                                            "interpDuration": 20,
+                                                                                                                                            "interpTarget": 20,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": 0.5,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                                {
+                                                                                                                                                    "randomSwitchState": "altIdle2",
+                                                                                                                                                    "var": "transitionToAltIdle2OnDone"
+                                                                                                                                                }
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "altIdle1",
+                                                                                                                                            "interpDuration": 1,
+                                                                                                                                            "interpTarget": 1,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": -1,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                                {
+                                                                                                                                                    "randomSwitchState": "alt1ToMasterIdle",
+                                                                                                                                                    "var": "finishAltIdle2"
+                                                                                                                                                }
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "altIdle2",
+                                                                                                                                            "interpDuration": 1,
+                                                                                                                                            "interpTarget": 1,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": -1,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                                {
+                                                                                                                                                    "randomSwitchState": "alt2ToMasterIdle",
+                                                                                                                                                    "var": "finishAltIdle2"
+                                                                                                                                                }
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "alt1ToMasterIdle",
+                                                                                                                                            "interpDuration": 24,
+                                                                                                                                            "interpTarget": 24,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": -1,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        },
+                                                                                                                                        {
+                                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                                            "id": "alt2ToMasterIdle",
+                                                                                                                                            "interpDuration": 24,
+                                                                                                                                            "interpTarget": 24,
+                                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                                            "priority": -1,
+                                                                                                                                            "resume": false,
+                                                                                                                                            "transitions": [
+                                                                                                                                            ]
+                                                                                                                                        }
+                                                                                                                                    ],
+                                                                                                                                    "transitionVar": "finishAltIdle2",
+                                                                                                                                    "triggerTimeMax": 60,
+                                                                                                                                    "triggerTimeMin": 10
+                                                                                                                                },
+                                                                                                                                "id": "alternateIdle",
+                                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                                            }
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "currentState": "movement",
+                                                                                                                            "states": [
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "movement",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.6,
+                                                                                                                                    "resume": false,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                                    "id": "alternateIdle",
+                                                                                                                                    "interpDuration": 30,
+                                                                                                                                    "interpTarget": 30,
+                                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                                    "priority": 0.4,
+                                                                                                                                    "resume": false,
+                                                                                                                                    "transitions": [
+                                                                                                                                    ]
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        "id": "fidget",
+                                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "masterIdle",
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "masterIdle",
+                                                                                                                            "interpDuration": 30,
+                                                                                                                            "interpTarget": 30,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "fidget",
+                                                                                                                                    "var": "timeToFidget"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "fidget",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": -1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_slownodOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_headtiltOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_shiftheelpivotOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idleWS_allOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_lookaroundOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_neckstretchOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_lookleftrightOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "idle_once_fidgetOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "alt1ToMasterIdleOnDone"
+                                                                                                                                },
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "masterIdle",
+                                                                                                                                    "var": "alt2ToMasterIdleOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "transitionVar": "timeToFidget",
+                                                                                                                    "triggerTimeMax": 50,
+                                                                                                                    "triggerTimeMin": 10
+                                                                                                                },
+                                                                                                                "id": "idleStand",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "alpha": 1,
+                                                                                                            "alphaVar": "talkOverlayAlpha",
+                                                                                                            "boneSet": "upperBody"
+                                                                                                        },
+                                                                                                        "id": "idleTalkOverlay",
+                                                                                                        "type": "overlay"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 64,
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/emote_agree_acknowledge.fbx"
                                                                                                                 },
-                                                                                                                "id": "applaudClap01Intro",
+                                                                                                                "id": "positiveAcknowledge",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 97,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 18,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "applaudClap01Loop",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 146,
+                                                                                                                    "endFrame": 55,
                                                                                                                     "loopFlag": false,
-                                                                                                                    "startFrame": 97,
+                                                                                                                    "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/emote_agree_headnod.fbx"
                                                                                                                 },
-                                                                                                                "id": "applaudClap01Outro",
+                                                                                                                "id": "positiveHeadNod",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 94,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/emote_agree_headnodyes.fbx"
+                                                                                                                },
+                                                                                                                "id": "positiveHeadNodYes",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 68,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/emote_agree_longheadnod.fbx"
+                                                                                                                },
+                                                                                                                "id": "positiveLongHeadNod",
+                                                                                                                "type": "clip"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "endFrame": 84,
+                                                                                                                    "loopFlag": false,
+                                                                                                                    "startFrame": 1,
+                                                                                                                    "timeScale": 1,
+                                                                                                                    "url": "qrc:///avatar/animations/emote_agree_thoughtfulheadnod.fbx"
+                                                                                                                },
+                                                                                                                "id": "positiveThoughtfulHeadNod",
                                                                                                                 "type": "clip"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "applaudClap01Intro",
+                                                                                                            "currentState": "positiveAcknowledge",
                                                                                                             "randomSwitchTimeMax": 10,
                                                                                                             "randomSwitchTimeMin": 1,
                                                                                                             "states": [
                                                                                                                 {
                                                                                                                     "easingType": "easeInOutQuad",
-                                                                                                                    "id": "applaudClap01Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
+                                                                                                                    "id": "positiveAcknowledge",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "interpType": "evaluateBoth",
                                                                                                                     "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap01Loop",
-                                                                                                                            "var": "applaudClap01IntroOnDone"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 },
                                                                                                                 {
-                                                                                                                    "id": "applaudClap01Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap01Outro",
-                                                                                                                            "var": "reactionApplaudDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "applaudClap01Outro",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "positiveHeadNod",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0,
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "positiveHeadNodYes",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "positiveLongHeadNod",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "positiveThoughtfulHeadNod",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 0.33,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap01Loop",
-                                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 }
                                                                                                             ],
                                                                                                             "triggerRandomSwitch": ""
                                                                                                         },
-                                                                                                        "id": "applaudClap01",
+                                                                                                        "id": "reactionPositive",
                                                                                                         "type": "randomSwitchStateMachine"
                                                                                                     },
                                                                                                     {
@@ -2818,108 +2978,26 @@
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 14,
+                                                                                                                    "endFrame": 72,
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/emote_disagree_annoyedheadshake.fbx"
                                                                                                                 },
-                                                                                                                "id": "applaudClap02Intro",
+                                                                                                                "id": "negativeAnnoyedHeadshake",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
                                                                                                                 "children": [
                                                                                                                 ],
                                                                                                                 "data": {
-                                                                                                                    "endFrame": 78,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 14,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "applaudClap02Loop",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 115,
-                                                                                                                    "loopFlag": false,
-                                                                                                                    "startFrame": 78,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "applaudClap02Outro",
-                                                                                                                "type": "clip"
-                                                                                                            }
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "currentState": "applaudClap02Intro",
-                                                                                                            "randomSwitchTimeMax": 10,
-                                                                                                            "randomSwitchTimeMin": 1,
-                                                                                                            "states": [
-                                                                                                                {
-                                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                                    "id": "applaudClap02Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 1,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap02Loop",
-                                                                                                                            "var": "applaudClap02IntroOnDone"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "applaudClap02Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap02Outro",
-                                                                                                                            "var": "reactionApplaudDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "applaudClap02Outro",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap02Loop",
-                                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                }
-                                                                                                            ],
-                                                                                                            "triggerRandomSwitch": ""
-                                                                                                        },
-                                                                                                        "id": "applaudClap02",
-                                                                                                        "type": "randomSwitchStateMachine"
-                                                                                                    },
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 14,
+                                                                                                                    "endFrame": 84,
                                                                                                                     "loopFlag": false,
                                                                                                                     "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/emote_disagree_thoughtfulheadshake.fbx"
                                                                                                                 },
-                                                                                                                "id": "applaudClap03Intro",
+                                                                                                                "id": "negativeThoughtfulHeadshake",
                                                                                                                 "type": "clip"
                                                                                                             },
                                                                                                             {
@@ -2927,426 +3005,2885 @@
                                                                                                                 ],
                                                                                                                 "data": {
                                                                                                                     "endFrame": 100,
-                                                                                                                    "loopFlag": true,
-                                                                                                                    "startFrame": 14,
-                                                                                                                    "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
-                                                                                                                },
-                                                                                                                "id": "applaudClap03Loop",
-                                                                                                                "type": "clip"
-                                                                                                            },
-                                                                                                            {
-                                                                                                                "children": [
-                                                                                                                ],
-                                                                                                                "data": {
-                                                                                                                    "endFrame": 149,
                                                                                                                     "loopFlag": false,
-                                                                                                                    "startFrame": 100,
+                                                                                                                    "startFrame": 1,
                                                                                                                     "timeScale": 1,
-                                                                                                                    "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
+                                                                                                                    "url": "qrc:///avatar/animations/emote_disagree_drophead.fbx"
                                                                                                                 },
-                                                                                                                "id": "applaudClap03Outro",
+                                                                                                                "id": "negativeDropHead",
                                                                                                                 "type": "clip"
                                                                                                             }
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "currentState": "applaudClap03Intro",
+                                                                                                            "currentState": "negativeAnnoyedHeadshake",
                                                                                                             "randomSwitchTimeMax": 10,
                                                                                                             "randomSwitchTimeMin": 1,
                                                                                                             "states": [
                                                                                                                 {
                                                                                                                     "easingType": "easeInOutQuad",
-                                                                                                                    "id": "applaudClap03Intro",
-                                                                                                                    "interpDuration": 18,
-                                                                                                                    "interpTarget": 18,
+                                                                                                                    "id": "negativeAnnoyedHeadshake",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "interpType": "evaluateBoth",
                                                                                                                     "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap03Loop",
-                                                                                                                            "var": "applaudClap03IntroOnDone"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 },
                                                                                                                 {
-                                                                                                                    "id": "applaudClap03Loop",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
-                                                                                                                    "priority": 0,
-                                                                                                                    "resume": false,
-                                                                                                                    "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap03Outro",
-                                                                                                                            "var": "reactionApplaudDisabled"
-                                                                                                                        }
-                                                                                                                    ]
-                                                                                                                },
-                                                                                                                {
-                                                                                                                    "id": "applaudClap03Outro",
-                                                                                                                    "interpDuration": 5,
-                                                                                                                    "interpTarget": 5,
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "negativeThoughtfulHeadshake",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
                                                                                                                     "interpType": "evaluateBoth",
-                                                                                                                    "priority": 0,
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "negativeDropHead",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
                                                                                                                     "resume": false,
                                                                                                                     "transitions": [
-                                                                                                                        {
-                                                                                                                            "randomSwitchState": "applaudClap03Loop",
-                                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                                        }
                                                                                                                     ]
                                                                                                                 }
-                                                                                                            ],
-                                                                                                            "triggerRandomSwitch": ""
+                                                                                                            ]
                                                                                                         },
-                                                                                                        "id": "applaudClap03",
+                                                                                                        "id": "reactionNegative",
                                                                                                         "type": "randomSwitchStateMachine"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 18,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand01Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 378,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 18,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand01Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 435,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 378,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand01Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "raiseHand01Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "raiseHand01Intro",
+                                                                                                                            "interpDuration": 10,
+                                                                                                                            "interpTarget": 10,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand01Loop",
+                                                                                                                                    "var": "raiseHand01IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand01Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand01Outro",
+                                                                                                                                    "var": "reactionRaiseHandDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand01Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand01Loop",
+                                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "raiseHand01",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 19,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand03Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 237,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 19,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand03Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 300,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 237,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand03Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "raiseHand03Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "raiseHand03Intro",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand03Loop",
+                                                                                                                                    "var": "raiseHand03IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand03Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand03Outro",
+                                                                                                                                    "var": "reactionRaiseHandDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand03Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand03Loop",
+                                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "raiseHand03",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 32,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand04Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 345,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 32,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand04Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 400,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 345,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_raisehand04_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "raiseHand04Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "raiseHand04Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "raiseHand04Intro",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand04Loop",
+                                                                                                                                    "var": "raiseHand04IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand04Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand04Outro",
+                                                                                                                                    "var": "reactionRaiseHandDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "raiseHand04Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "raiseHand04Loop",
+                                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "raiseHand04",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "currentState": "raiseHand01",
+                                                                                                            "randomSwitchTimeMax": 10,
+                                                                                                            "randomSwitchTimeMin": 1,
+                                                                                                            "states": [
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "raiseHand01",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "raiseHand03",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "raiseHand04",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        "id": "reactionRaiseHand",
+                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 17,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap01Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 111,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 17,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap01Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 160,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 111,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap01Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "applaudClap01Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "applaudClap01Intro",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap01Loop",
+                                                                                                                                    "var": "applaudClap01IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap01Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap01Outro",
+                                                                                                                                    "var": "reactionApplaudDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap01Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap01Loop",
+                                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "applaudClap01",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 14,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap02Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 78,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 14,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap02Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 115,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 78,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap02_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap02Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "applaudClap02Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "applaudClap02Intro",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap02Loop",
+                                                                                                                                    "var": "applaudClap02IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap02Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap02Outro",
+                                                                                                                                    "var": "reactionApplaudDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap02Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap02Loop",
+                                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "applaudClap02",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 14,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap03Intro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 100,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 14,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap03Loop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 149,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 100,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_clap03_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "applaudClap03Outro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "applaudClap03Intro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "applaudClap03Intro",
+                                                                                                                            "interpDuration": 15,
+                                                                                                                            "interpTarget": 15,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap03Loop",
+                                                                                                                                    "var": "applaudClap03IntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap03Loop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap03Outro",
+                                                                                                                                    "var": "reactionApplaudDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "applaudClap03Outro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "applaudClap03Loop",
+                                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "applaudClap03",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "currentState": "applaudClap01",
+                                                                                                            "randomSwitchTimeMax": 10,
+                                                                                                            "randomSwitchTimeMin": 1,
+                                                                                                            "states": [
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "applaudClap01",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "applaudClap02",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                                    "id": "applaudClap03",
+                                                                                                                    "interpDuration": 1,
+                                                                                                                    "interpTarget": 1,
+                                                                                                                    "interpType": "evaluateBoth",
+                                                                                                                    "priority": 1,
+                                                                                                                    "resume": false,
+                                                                                                                    "transitions": [
+                                                                                                                    ]
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        "id": "reactionApplaud",
+                                                                                                        "type": "randomSwitchStateMachine"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 21,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 1,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "reactionPointIntro",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 100,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 21,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "reactionPointLoop",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "endFrame": 134,
+                                                                                                                            "loopFlag": false,
+                                                                                                                            "startFrame": 100,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "reactionPointOutro",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "currentState": "reactionPointIntro",
+                                                                                                                    "randomSwitchTimeMax": 10,
+                                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                                    "states": [
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "reactionPointIntro",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 1,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "reactionPointLoop",
+                                                                                                                                    "var": "reactionPointIntroOnDone"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "id": "reactionPointLoop",
+                                                                                                                            "interpDuration": 1,
+                                                                                                                            "interpTarget": 1,
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "reactionPointOutro",
+                                                                                                                                    "var": "reactionPointDisabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        },
+                                                                                                                        {
+                                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                                            "id": "reactionPointOutro",
+                                                                                                                            "interpDuration": 6,
+                                                                                                                            "interpTarget": 6,
+                                                                                                                            "interpType": "evaluateBoth",
+                                                                                                                            "priority": 0,
+                                                                                                                            "resume": false,
+                                                                                                                            "transitions": [
+                                                                                                                                {
+                                                                                                                                    "randomSwitchState": "reactionPointLoop",
+                                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                                }
+                                                                                                                            ]
+                                                                                                                        }
+                                                                                                                    ],
+                                                                                                                    "triggerRandomSwitch": ""
+                                                                                                                },
+                                                                                                                "id": "reactionPoint",
+                                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "children": [
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 11,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 11,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 30,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 30,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 50,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 50,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointUp",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 70,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 70,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointDown",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 90,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 90,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointUpLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 110,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 110,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointUpRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 130,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 130,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointDownLeft",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 150,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 150,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointDownRight",
+                                                                                                                        "type": "clip"
+                                                                                                                    },
+                                                                                                                    {
+                                                                                                                        "children": [
+                                                                                                                        ],
+                                                                                                                        "data": {
+                                                                                                                            "baseFrame": 1,
+                                                                                                                            "baseURL": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx",
+                                                                                                                            "blendType": "addAbsolute",
+                                                                                                                            "endFrame": 3,
+                                                                                                                            "loopFlag": true,
+                                                                                                                            "startFrame": 3,
+                                                                                                                            "timeScale": 1,
+                                                                                                                            "url": "qrc:///avatar/animations/emote_point01_aimoffsets.fbx"
+                                                                                                                        },
+                                                                                                                        "id": "idlePointCenter",
+                                                                                                                        "type": "clip"
+                                                                                                                    }
+                                                                                                                ],
+                                                                                                                "data": {
+                                                                                                                    "alpha": [
+                                                                                                                        0,
+                                                                                                                        0,
+                                                                                                                        0
+                                                                                                                    ],
+                                                                                                                    "alphaVar": "pointAroundAlpha",
+                                                                                                                    "centerId": "idlePointCenter",
+                                                                                                                    "downId": "idlePointDown",
+                                                                                                                    "downLeftId": "idlePointDownLeft",
+                                                                                                                    "downRightId": "idlePointDownRight",
+                                                                                                                    "leftId": "idlePointLeft",
+                                                                                                                    "rightId": "idlePointRight",
+                                                                                                                    "upId": "idlePointUp",
+                                                                                                                    "upLeftId": "idlePointUpLeft",
+                                                                                                                    "upRightId": "idlePointUpRight"
+                                                                                                                },
+                                                                                                                "id": "idlePointAround",
+                                                                                                                "type": "blendDirectional"
+                                                                                                            }
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "alpha": 0,
+                                                                                                            "alphaVar": "pointBlendAlpha",
+                                                                                                            "blendType": "addAbsolute"
+                                                                                                        },
+                                                                                                        "id": "reactionPoint",
+                                                                                                        "type": "blendLinear"
                                                                                                     }
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "currentState": "applaudClap01",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
+                                                                                                    "currentState": "idleTalkOverlay",
                                                                                                     "states": [
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "applaudClap01",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
+                                                                                                            "id": "idleTalkOverlay",
+                                                                                                            "interpDuration": 20,
+                                                                                                            "interpTarget": 20,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "reactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         },
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "applaudClap02",
+                                                                                                            "id": "reactionPositive",
                                                                                                             "interpDuration": 18,
                                                                                                             "interpTarget": 18,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "positiveAcknowledgeOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "positiveHeadNodOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "positiveHeadNodYesOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "positiveLongHeadNodOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "positiveThoughtfulHeadNodOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         },
                                                                                                         {
                                                                                                             "easingType": "easeInOutQuad",
-                                                                                                            "id": "applaudClap03",
+                                                                                                            "id": "reactionNegative",
                                                                                                             "interpDuration": 18,
                                                                                                             "interpTarget": 18,
                                                                                                             "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
                                                                                                             "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "reactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "negativeAnnoyedHeadshakeOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "negativeThoughtfulHeadshakeOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "negativeDropHeadOnDone"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "reactionRaiseHand",
+                                                                                                            "interpDuration": 18,
+                                                                                                            "interpTarget": 18,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "reactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "reactionRaiseHandDisabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "reactionApplaud",
+                                                                                                            "interpDuration": 18,
+                                                                                                            "interpTarget": 18,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "reactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "reactionApplaudDisabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPoint",
+                                                                                                                    "var": "reactionPointEnabled"
+                                                                                                                }
+                                                                                                            ]
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "easingType": "easeInOutQuad",
+                                                                                                            "id": "reactionPoint",
+                                                                                                            "interpDuration": 10,
+                                                                                                            "interpTarget": 10,
+                                                                                                            "interpType": "evaluateBoth",
+                                                                                                            "transitions": [
+                                                                                                                {
+                                                                                                                    "state": "reactionNegative",
+                                                                                                                    "var": "reactionNegativeTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionPositive",
+                                                                                                                    "var": "reactionPositiveTrigger"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionRaiseHand",
+                                                                                                                    "var": "reactionRaiseHandEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "reactionApplaud",
+                                                                                                                    "var": "reactionApplaudEnabled"
+                                                                                                                },
+                                                                                                                {
+                                                                                                                    "state": "idleTalkOverlay",
+                                                                                                                    "var": "reactionPointDisabled"
+                                                                                                                }
                                                                                                             ]
                                                                                                         }
                                                                                                     ]
                                                                                                 },
-                                                                                                "id": "reactionApplaud",
-                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                "id": "idle",
+                                                                                                "type": "stateMachine"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
-                                                                                                    {
-                                                                                                        "children": [
-                                                                                                        ],
-                                                                                                        "data": {
-                                                                                                            "endFrame": 22,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 1,
-                                                                                                            "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
-                                                                                                        },
-                                                                                                        "id": "reactionPointIntro",
-                                                                                                        "type": "clip"
-                                                                                                    },
                                                                                                     {
                                                                                                         "children": [
                                                                                                         ],
                                                                                                         "data": {
                                                                                                             "endFrame": 40,
                                                                                                             "loopFlag": true,
-                                                                                                            "startFrame": 22,
+                                                                                                            "startFrame": 1,
                                                                                                             "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
+                                                                                                            "url": "qrc:///avatar/animations/walk_short_fwd.fbx"
                                                                                                         },
-                                                                                                        "id": "reactionPointLoop",
+                                                                                                        "id": "walkFwdShort_c",
                                                                                                         "type": "clip"
                                                                                                     },
                                                                                                     {
                                                                                                         "children": [
                                                                                                         ],
                                                                                                         "data": {
-                                                                                                            "endFrame": 78,
-                                                                                                            "loopFlag": false,
-                                                                                                            "startFrame": 40,
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
                                                                                                             "timeScale": 1,
-                                                                                                            "url": "qrc:///avatar/animations/emote_point01_all.fbx"
+                                                                                                            "url": "qrc:///avatar/animations/walk_fwd.fbx"
                                                                                                         },
-                                                                                                        "id": "reactionPointOutro",
+                                                                                                        "id": "walkFwdNormal_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 26,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_fwd_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "walkFwdFast_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 18,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jog_fwd.fbx"
+                                                                                                        },
+                                                                                                        "id": "walkFwdJog_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 19,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/run_fast_fwd.fbx"
+                                                                                                        },
+                                                                                                        "id": "walkFwdRun_c",
                                                                                                         "type": "clip"
                                                                                                     }
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "currentState": "reactionPointIntro",
-                                                                                                    "randomSwitchTimeMax": 10,
-                                                                                                    "randomSwitchTimeMin": 1,
-                                                                                                    "states": [
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "reactionPointIntro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 1,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "reactionPointLoop",
-                                                                                                                    "var": "reactionPointIntroOnDone"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "id": "reactionPointLoop",
-                                                                                                            "interpDuration": 5,
-                                                                                                            "interpTarget": 5,
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "reactionPointOutro",
-                                                                                                                    "var": "reactionPointDisabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "easingType": "easeInOutQuad",
-                                                                                                            "id": "reactionPointOutro",
-                                                                                                            "interpDuration": 18,
-                                                                                                            "interpTarget": 18,
-                                                                                                            "interpType": "evaluateBoth",
-                                                                                                            "priority": 0,
-                                                                                                            "resume": false,
-                                                                                                            "transitions": [
-                                                                                                                {
-                                                                                                                    "randomSwitchState": "reactionPointLoop",
-                                                                                                                    "var": "reactionPointEnabled"
-                                                                                                                }
-                                                                                                            ]
-                                                                                                        }
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveForwardAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0.5,
+                                                                                                        1.8,
+                                                                                                        2.5,
+                                                                                                        3.55,
+                                                                                                        5.675
                                                                                                     ],
-                                                                                                    "triggerRandomSwitch": ""
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveForwardSpeed"
                                                                                                 },
-                                                                                                "id": "reactionPoint",
-                                                                                                "type": "randomSwitchStateMachine"
+                                                                                                "id": "WALKFWD",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 13,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/idle_to_walk.fbx"
+                                                                                                },
+                                                                                                "id": "idleToWalkFwd",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 59,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/settle_to_idle_small.fbx"
+                                                                                                },
+                                                                                                "id": "idleSettle",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 37,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_bwd.fbx"
+                                                                                                        },
+                                                                                                        "id": "walkBwdShort_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 28,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_bwd_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "walkBwdFast_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jog_bwd.fbx"
+                                                                                                        },
+                                                                                                        "id": "jogBwd_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 14,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/run_bwd.fbx"
+                                                                                                        },
+                                                                                                        "id": "runBwd_c",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveBackwardAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0.6,
+                                                                                                        1.6,
+                                                                                                        2.8,
+                                                                                                        4.5
+                                                                                                    ],
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveBackwardSpeed"
+                                                                                                },
+                                                                                                "id": "WALKBWD",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 33,
+                                                                                                    "loopFlag": true,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/turn_left.fbx"
+                                                                                                },
+                                                                                                "id": "turnLeft",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 31,
+                                                                                                    "loopFlag": true,
+                                                                                                    "mirrorFlag": false,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/turn_right.fbx"
+                                                                                                },
+                                                                                                "id": "turnRight",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_short_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftShortStep_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftStep_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 35,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftWalk_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 21,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_left_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftWalkFast_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jog_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftJog_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 19,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/run_fast_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftRun_c",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveLateralAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0.1,
+                                                                                                        0.5,
+                                                                                                        1,
+                                                                                                        2.55,
+                                                                                                        3.35,
+                                                                                                        5.25
+                                                                                                    ],
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveLateralSpeed"
+                                                                                                },
+                                                                                                "id": "STRAFELEFT",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_short_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightShortStep_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightStep_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 35,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": false,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_right.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightWalk_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 21,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": false,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/walk_right_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightFast_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": false,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jog_right.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightJog_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 19,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": false,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/run_fast_right.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightRun_c",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveLateralAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0.1,
+                                                                                                        0.5,
+                                                                                                        1,
+                                                                                                        2.55,
+                                                                                                        3.4,
+                                                                                                        5.25
+                                                                                                    ],
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveLateralSpeed"
+                                                                                                },
+                                                                                                "id": "STRAFERIGHT",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_short_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "stepLeftShort_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "stepLeft_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 16,
+                                                                                                            "loopFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeLeftAnim_c",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveLateralAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0,
+                                                                                                        0.5,
+                                                                                                        2.5
+                                                                                                    ],
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveLateralSpeed"
+                                                                                                },
+                                                                                                "id": "strafeLeftHmd",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 30,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_short_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "stepRightShort_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 20,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left.fbx"
+                                                                                                        },
+                                                                                                        "id": "stepRight_c",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 16,
+                                                                                                            "loopFlag": true,
+                                                                                                            "mirrorFlag": true,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/side_step_left_fast.fbx"
+                                                                                                        },
+                                                                                                        "id": "strafeRightAnim_c",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "moveLateralAlpha",
+                                                                                                    "characteristicSpeeds": [
+                                                                                                        0,
+                                                                                                        0.5,
+                                                                                                        2.5
+                                                                                                    ],
+                                                                                                    "desiredSpeed": 1.4,
+                                                                                                    "desiredSpeedVar": "moveLateralSpeed"
+                                                                                                },
+                                                                                                "id": "strafeRightHmd",
+                                                                                                "type": "blendLinearMove"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 79,
+                                                                                                    "loopFlag": true,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/fly.fbx"
+                                                                                                },
+                                                                                                "id": "fly",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 16,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/jump_standing_launch_all.fbx"
+                                                                                                },
+                                                                                                "id": "takeoffStand",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 15,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 4,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
+                                                                                                },
+                                                                                                "id": "TAKEOFFRUN",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 1,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 1,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirStandPreApex",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 2,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 2,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirStandApex",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 3,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 3,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirStandPostApex",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "inAirAlpha"
+                                                                                                },
+                                                                                                "id": "inAirStand",
+                                                                                                "type": "blendLinear"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 16,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 16,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirRunPreApex",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 22,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 22,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirRunApex",
+                                                                                                        "type": "clip"
+                                                                                                    },
+                                                                                                    {
+                                                                                                        "children": [
+                                                                                                        ],
+                                                                                                        "data": {
+                                                                                                            "endFrame": 33,
+                                                                                                            "loopFlag": false,
+                                                                                                            "startFrame": 33,
+                                                                                                            "timeScale": 1,
+                                                                                                            "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
+                                                                                                        },
+                                                                                                        "id": "inAirRunPostApex",
+                                                                                                        "type": "clip"
+                                                                                                    }
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "alpha": 0,
+                                                                                                    "alphaVar": "inAirAlpha"
+                                                                                                },
+                                                                                                "id": "INAIRRUN",
+                                                                                                "type": "blendLinear"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 6,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 1,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/jump_standing_land_settle_all.fbx"
+                                                                                                },
+                                                                                                "id": "landStandImpact",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 68,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 6,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/jump_standing_land_settle_all.fbx"
+                                                                                                },
+                                                                                                "id": "landStand",
+                                                                                                "type": "clip"
+                                                                                            },
+                                                                                            {
+                                                                                                "children": [
+                                                                                                ],
+                                                                                                "data": {
+                                                                                                    "endFrame": 40,
+                                                                                                    "loopFlag": false,
+                                                                                                    "startFrame": 29,
+                                                                                                    "timeScale": 1,
+                                                                                                    "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
+                                                                                                },
+                                                                                                "id": "LANDRUN",
+                                                                                                "type": "clip"
                                                                                             }
                                                                                         ],
                                                                                         "data": {
-                                                                                            "currentState": "idleTalkOverlay",
+                                                                                            "currentState": "idle",
+                                                                                            "outputJoints": [
+                                                                                                "LeftFoot",
+                                                                                                "RightFoot"
+                                                                                            ],
                                                                                             "states": [
                                                                                                 {
                                                                                                     "easingType": "easeInOutQuad",
-                                                                                                    "id": "idleTalkOverlay",
+                                                                                                    "id": "seated",
+                                                                                                    "interpDuration": 6,
+                                                                                                    "interpTarget": 6,
+                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "isNotSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                    "id": "idle",
+                                                                                                    "interpDuration": 20,
+                                                                                                    "interpTarget": 20,
+                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "idleToWalkFwd",
+                                                                                                    "interpDuration": 8,
+                                                                                                    "interpTarget": 12,
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "idleToWalkFwdOnDone"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                    "id": "idleSettle",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 15,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "idleSettleOnDone"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "reactionPositiveTrigger"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "reactionNegativeTrigger"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "reactionRaiseHandEnabled"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "reactionApplaudEnabled"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "reactionPointEnabled"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "WALKFWD",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 35,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "WALKBWD",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 35,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "STRAFERIGHT",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 25,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "STRAFELEFT",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 25,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                    "id": "turnRight",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 15,
+                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "isNotTurning"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                    "id": "turnLeft",
+                                                                                                    "interpDuration": 15,
+                                                                                                    "interpTarget": 15,
+                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "isNotTurning"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "strafeRightHmd",
+                                                                                                    "interpDuration": 8,
+                                                                                                    "interpTarget": 8,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "strafeLeftHmd",
+                                                                                                    "interpDuration": 8,
+                                                                                                    "interpTarget": 8,
+                                                                                                    "interpType": "snapshotPrev",
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotMoving"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "easingType": "easeInOutQuad",
+                                                                                                    "id": "fly",
                                                                                                     "interpDuration": 24,
                                                                                                     "interpTarget": 24,
                                                                                                     "interpType": "evaluateBoth",
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "reactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
+                                                                                                            "state": "idleSettle",
+                                                                                                            "var": "isNotFlying"
                                                                                                         }
                                                                                                     ]
                                                                                                 },
                                                                                                 {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "reactionPositive",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "id": "takeoffStand",
+                                                                                                    "interpDuration": 2,
+                                                                                                    "interpTarget": 2,
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "positiveAcknowledgeOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "positiveHeadNodOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "positiveHeadNodYesOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "positiveLongHeadNodOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "positiveThoughtfulHeadNodOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isNotTakeoff"
                                                                                                         }
                                                                                                     ]
                                                                                                 },
                                                                                                 {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "reactionNegative",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "id": "TAKEOFFRUN",
+                                                                                                    "interpDuration": 2,
+                                                                                                    "interpTarget": 2,
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "reactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "negativeAnnoyedHeadshakeOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "negativeThoughtfulHeadshakeOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "negativeDropHeadOnDone"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isNotTakeoff"
                                                                                                         }
                                                                                                     ]
                                                                                                 },
                                                                                                 {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "reactionRaiseHand",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "id": "inAirStand",
+                                                                                                    "interpDuration": 3,
+                                                                                                    "interpTarget": 3,
+                                                                                                    "interpType": "snapshotPrev",
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "reactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "reactionRaiseHandDisabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
+                                                                                                            "state": "landStandImpact",
+                                                                                                            "var": "isNotInAir"
                                                                                                         }
                                                                                                     ]
                                                                                                 },
                                                                                                 {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "reactionApplaud",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "id": "INAIRRUN",
+                                                                                                    "interpDuration": 3,
+                                                                                                    "interpTarget": 3,
+                                                                                                    "interpType": "snapshotPrev",
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "reactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "reactionApplaudDisabled"
-                                                                                                        },
-                                                                                                        {
-                                                                                                            "state": "reactionPoint",
-                                                                                                            "var": "reactionPointEnabled"
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isNotInAir"
                                                                                                         }
                                                                                                     ]
                                                                                                 },
                                                                                                 {
-                                                                                                    "easingType": "easeInOutQuad",
-                                                                                                    "id": "reactionPoint",
-                                                                                                    "interpDuration": 18,
-                                                                                                    "interpTarget": 18,
-                                                                                                    "interpType": "evaluateBoth",
+                                                                                                    "id": "landStandImpact",
+                                                                                                    "interpDuration": 1,
+                                                                                                    "interpTarget": 1,
                                                                                                     "transitions": [
                                                                                                         {
-                                                                                                            "state": "reactionNegative",
-                                                                                                            "var": "reactionNegativeTrigger"
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
                                                                                                         },
                                                                                                         {
-                                                                                                            "state": "reactionPositive",
-                                                                                                            "var": "reactionPositiveTrigger"
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
                                                                                                         },
                                                                                                         {
-                                                                                                            "state": "reactionRaiseHand",
-                                                                                                            "var": "reactionRaiseHandEnabled"
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
                                                                                                         },
                                                                                                         {
-                                                                                                            "state": "reactionApplaud",
-                                                                                                            "var": "reactionApplaudEnabled"
+                                                                                                            "state": "landStand",
+                                                                                                            "var": "landStandImpactOnDone"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "landStand",
+                                                                                                    "interpDuration": 1,
+                                                                                                    "interpTarget": 1,
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "isMovingForward"
                                                                                                         },
                                                                                                         {
-                                                                                                            "state": "idleTalkOverlay",
-                                                                                                            "var": "reactionPointDisabled"
+                                                                                                            "state": "WALKBWD",
+                                                                                                            "var": "isMovingBackward"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFERIGHT",
+                                                                                                            "var": "isMovingRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "STRAFELEFT",
+                                                                                                            "var": "isMovingLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnRight",
+                                                                                                            "var": "isTurningRight"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "turnLeft",
+                                                                                                            "var": "isTurningLeft"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "inAirStand",
+                                                                                                            "var": "isInAirStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "INAIRRUN",
+                                                                                                            "var": "isInAirRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "idle",
+                                                                                                            "var": "landStandOnDone"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeRightHmd",
+                                                                                                            "var": "isMovingRightHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "strafeLeftHmd",
+                                                                                                            "var": "isMovingLeftHmd"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "seated",
+                                                                                                            "var": "isSeated"
+                                                                                                        }
+                                                                                                    ]
+                                                                                                },
+                                                                                                {
+                                                                                                    "id": "LANDRUN",
+                                                                                                    "interpDuration": 2,
+                                                                                                    "interpTarget": 2,
+                                                                                                    "transitions": [
+                                                                                                        {
+                                                                                                            "state": "fly",
+                                                                                                            "var": "isFlying"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "takeoffStand",
+                                                                                                            "var": "isTakeoffStand"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "TAKEOFFRUN",
+                                                                                                            "var": "isTakeoffRun"
+                                                                                                        },
+                                                                                                        {
+                                                                                                            "state": "WALKFWD",
+                                                                                                            "var": "landRunOnDone"
                                                                                                         }
                                                                                                     ]
                                                                                                 }
                                                                                             ]
                                                                                         },
-                                                                                        "id": "idle",
+                                                                                        "id": "mainStateMachine",
                                                                                         "type": "stateMachine"
                                                                                     },
                                                                                     {
@@ -3355,1637 +5892,175 @@
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 40,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 11,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 11,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_short_fwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkFwdShort_c",
+                                                                                                "id": "lookLeft",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
                                                                                                     "endFrame": 30,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 30,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_fwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkFwdNormal_c",
+                                                                                                "id": "lookRight",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 26,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 50,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 50,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_fwd_fast.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkFwdFast_c",
+                                                                                                "id": "lookUp",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 18,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 70,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 70,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jog_fwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkFwdJog_c",
+                                                                                                "id": "lookDown",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 19,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 97,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 97,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/run_fast_fwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkFwdRun_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveForwardAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0.5,
-                                                                                                1.8,
-                                                                                                2.5,
-                                                                                                3.55,
-                                                                                                5.675
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveForwardSpeed"
-                                                                                        },
-                                                                                        "id": "WALKFWD",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 13,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/idle_to_walk.fbx"
-                                                                                        },
-                                                                                        "id": "idleToWalkFwd",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 59,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/settle_to_idle_small.fbx"
-                                                                                        },
-                                                                                        "id": "idleSettle",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 37,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_bwd.fbx"
-                                                                                                },
-                                                                                                "id": "walkBwdShort_c",
+                                                                                                "id": "lookUpLeft",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 28,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 110,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 110,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_bwd_fast.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "walkBwdFast_c",
+                                                                                                "id": "lookUpRight",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 20,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 130,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 130,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jog_bwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "jogBwd_c",
+                                                                                                "id": "lookDownLeft",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
-                                                                                                    "endFrame": 14,
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
+                                                                                                    "endFrame": 150,
                                                                                                     "loopFlag": true,
-                                                                                                    "startFrame": 1,
+                                                                                                    "startFrame": 150,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/run_bwd.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "runBwd_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveBackwardAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0.6,
-                                                                                                1.6,
-                                                                                                2.8,
-                                                                                                4.5
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveBackwardSpeed"
-                                                                                        },
-                                                                                        "id": "WALKBWD",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 33,
-                                                                                            "loopFlag": true,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/turn_left.fbx"
-                                                                                        },
-                                                                                        "id": "turnLeft",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 31,
-                                                                                            "loopFlag": true,
-                                                                                            "mirrorFlag": false,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/turn_right.fbx"
-                                                                                        },
-                                                                                        "id": "turnRight",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_short_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftShortStep_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftStep_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 35,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftWalk_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 21,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_left_fast.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftWalkFast_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jog_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftJog_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 19,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/run_fast_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftRun_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveLateralAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0.1,
-                                                                                                0.5,
-                                                                                                1,
-                                                                                                2.55,
-                                                                                                3.35,
-                                                                                                5.25
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveLateralSpeed"
-                                                                                        },
-                                                                                        "id": "STRAFELEFT",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_short_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightShortStep_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightStep_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 35,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": false,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_right.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightWalk_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 21,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": false,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/walk_right_fast.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightFast_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": false,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jog_right.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightJog_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 19,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": false,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/run_fast_right.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightRun_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveLateralAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0.1,
-                                                                                                0.5,
-                                                                                                1,
-                                                                                                2.55,
-                                                                                                3.4,
-                                                                                                5.25
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveLateralSpeed"
-                                                                                        },
-                                                                                        "id": "STRAFERIGHT",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_short_left.fbx"
-                                                                                                },
-                                                                                                "id": "stepLeftShort_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left.fbx"
-                                                                                                },
-                                                                                                "id": "stepLeft_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 16,
-                                                                                                    "loopFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left_fast.fbx"
-                                                                                                },
-                                                                                                "id": "strafeLeftAnim_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveLateralAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0,
-                                                                                                0.5,
-                                                                                                2.5
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveLateralSpeed"
-                                                                                        },
-                                                                                        "id": "strafeLeftHmd",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 30,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_short_left.fbx"
-                                                                                                },
-                                                                                                "id": "stepRightShort_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 20,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left.fbx"
-                                                                                                },
-                                                                                                "id": "stepRight_c",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 16,
-                                                                                                    "loopFlag": true,
-                                                                                                    "mirrorFlag": true,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/side_step_left_fast.fbx"
-                                                                                                },
-                                                                                                "id": "strafeRightAnim_c",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "moveLateralAlpha",
-                                                                                            "characteristicSpeeds": [
-                                                                                                0,
-                                                                                                0.5,
-                                                                                                2.5
-                                                                                            ],
-                                                                                            "desiredSpeed": 1.4,
-                                                                                            "desiredSpeedVar": "moveLateralSpeed"
-                                                                                        },
-                                                                                        "id": "strafeRightHmd",
-                                                                                        "type": "blendLinearMove"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 79,
-                                                                                            "loopFlag": true,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/fly.fbx"
-                                                                                        },
-                                                                                        "id": "fly",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 16,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/jump_standing_launch_all.fbx"
-                                                                                        },
-                                                                                        "id": "takeoffStand",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 15,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 4,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
-                                                                                        },
-                                                                                        "id": "TAKEOFFRUN",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 1,
-                                                                                                    "loopFlag": false,
-                                                                                                    "startFrame": 1,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
-                                                                                                },
-                                                                                                "id": "inAirStandPreApex",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 2,
-                                                                                                    "loopFlag": false,
-                                                                                                    "startFrame": 2,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
-                                                                                                },
-                                                                                                "id": "inAirStandApex",
+                                                                                                "id": "lookDownRight",
                                                                                                 "type": "clip"
                                                                                             },
                                                                                             {
                                                                                                 "children": [
                                                                                                 ],
                                                                                                 "data": {
+                                                                                                    "baseFrame": 1,
+                                                                                                    "baseURL": "qrc:///avatar/animations/idle_aimoffsets.fbx",
+                                                                                                    "blendType": "addAbsolute",
                                                                                                     "endFrame": 3,
-                                                                                                    "loopFlag": false,
+                                                                                                    "loopFlag": true,
                                                                                                     "startFrame": 3,
                                                                                                     "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_standing_apex_all.fbx"
+                                                                                                    "url": "qrc:///avatar/animations/idle_aimoffsets.fbx"
                                                                                                 },
-                                                                                                "id": "inAirStandPostApex",
+                                                                                                "id": "lookCenter",
                                                                                                 "type": "clip"
                                                                                             }
                                                                                         ],
                                                                                         "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "inAirAlpha"
+                                                                                            "alpha": [
+                                                                                                0,
+                                                                                                0,
+                                                                                                0
+                                                                                            ],
+                                                                                            "alphaVar": "lookAroundAlpha",
+                                                                                            "centerId": "lookCenter",
+                                                                                            "downId": "lookDown",
+                                                                                            "downLeftId": "lookDownLeft",
+                                                                                            "downRightId": "lookDownRight",
+                                                                                            "leftId": "lookLeft",
+                                                                                            "rightId": "lookRight",
+                                                                                            "upId": "lookUp",
+                                                                                            "upLeftId": "lookUpLeft",
+                                                                                            "upRightId": "lookUpRight"
                                                                                         },
-                                                                                        "id": "inAirStand",
-                                                                                        "type": "blendLinear"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 16,
-                                                                                                    "loopFlag": false,
-                                                                                                    "startFrame": 16,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
-                                                                                                },
-                                                                                                "id": "inAirRunPreApex",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 22,
-                                                                                                    "loopFlag": false,
-                                                                                                    "startFrame": 22,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
-                                                                                                },
-                                                                                                "id": "inAirRunApex",
-                                                                                                "type": "clip"
-                                                                                            },
-                                                                                            {
-                                                                                                "children": [
-                                                                                                ],
-                                                                                                "data": {
-                                                                                                    "endFrame": 33,
-                                                                                                    "loopFlag": false,
-                                                                                                    "startFrame": 33,
-                                                                                                    "timeScale": 1,
-                                                                                                    "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
-                                                                                                },
-                                                                                                "id": "inAirRunPostApex",
-                                                                                                "type": "clip"
-                                                                                            }
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "alpha": 0,
-                                                                                            "alphaVar": "inAirAlpha"
-                                                                                        },
-                                                                                        "id": "INAIRRUN",
-                                                                                        "type": "blendLinear"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 6,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 1,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/jump_standing_land_settle_all.fbx"
-                                                                                        },
-                                                                                        "id": "landStandImpact",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 68,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 6,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/jump_standing_land_settle_all.fbx"
-                                                                                        },
-                                                                                        "id": "landStand",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 40,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 29,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/jump_running_launch_land_all.fbx"
-                                                                                        },
-                                                                                        "id": "LANDRUN",
-                                                                                        "type": "clip"
-                                                                                    },
-                                                                                    {
-                                                                                        "children": [
-                                                                                        ],
-                                                                                        "data": {
-                                                                                            "endFrame": 105,
-                                                                                            "loopFlag": false,
-                                                                                            "startFrame": 100,
-                                                                                            "timeScale": 1,
-                                                                                            "url": "qrc:///avatar/animations/idle.fbx"
-                                                                                        },
-                                                                                        "id": "seatedToIdle",
-                                                                                        "type": "clip"
+                                                                                        "id": "lookAroundBlend",
+                                                                                        "type": "blendDirectional"
                                                                                     }
                                                                                 ],
                                                                                 "data": {
-                                                                                    "currentState": "idle",
-                                                                                    "outputJoints": [
-                                                                                        "LeftFoot",
-                                                                                        "RightFoot"
-                                                                                    ],
-                                                                                    "states": [
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "seated",
-                                                                                            "interpDuration": 18,
-                                                                                            "interpTarget": 20,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "seatedToIdle",
-                                                                                                    "var": "isNotSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "idle",
-                                                                                            "interpDuration": 30,
-                                                                                            "interpTarget": 30,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "idleToWalkFwd",
-                                                                                            "interpDuration": 8,
-                                                                                            "interpTarget": 12,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "idleToWalkFwdOnDone"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "idleSettle",
-                                                                                            "interpDuration": 12,
-                                                                                            "interpTarget": 12,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "idleSettleOnDone"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "WALKFWD",
-                                                                                            "interpDuration": 10,
-                                                                                            "interpTarget": 35,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "WALKBWD",
-                                                                                            "interpDuration": 10,
-                                                                                            "interpTarget": 35,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "STRAFERIGHT",
-                                                                                            "interpDuration": 8,
-                                                                                            "interpTarget": 25,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "STRAFELEFT",
-                                                                                            "interpDuration": 8,
-                                                                                            "interpTarget": 25,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "turnRight",
-                                                                                            "interpDuration": 15,
-                                                                                            "interpTarget": 15,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "isNotTurning"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "turnLeft",
-                                                                                            "interpDuration": 15,
-                                                                                            "interpTarget": 15,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "isNotTurning"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "strafeRightHmd",
-                                                                                            "interpDuration": 8,
-                                                                                            "interpTarget": 8,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "strafeLeftHmd",
-                                                                                            "interpDuration": 8,
-                                                                                            "interpTarget": 8,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotMoving"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "easingType": "easeInOutQuad",
-                                                                                            "id": "fly",
-                                                                                            "interpDuration": 24,
-                                                                                            "interpTarget": 24,
-                                                                                            "interpType": "evaluateBoth",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idleSettle",
-                                                                                                    "var": "isNotFlying"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "takeoffStand",
-                                                                                            "interpDuration": 2,
-                                                                                            "interpTarget": 2,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isNotTakeoff"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "TAKEOFFRUN",
-                                                                                            "interpDuration": 2,
-                                                                                            "interpTarget": 2,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isNotTakeoff"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "inAirStand",
-                                                                                            "interpDuration": 3,
-                                                                                            "interpTarget": 3,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "landStandImpact",
-                                                                                                    "var": "isNotInAir"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "INAIRRUN",
-                                                                                            "interpDuration": 3,
-                                                                                            "interpTarget": 3,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isNotInAir"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "landStandImpact",
-                                                                                            "interpDuration": 1,
-                                                                                            "interpTarget": 1,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "landStand",
-                                                                                                    "var": "landStandImpactOnDone"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "landStand",
-                                                                                            "interpDuration": 1,
-                                                                                            "interpTarget": 1,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "isMovingForward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKBWD",
-                                                                                                    "var": "isMovingBackward"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFERIGHT",
-                                                                                                    "var": "isMovingRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "STRAFELEFT",
-                                                                                                    "var": "isMovingLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnRight",
-                                                                                                    "var": "isTurningRight"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "turnLeft",
-                                                                                                    "var": "isTurningLeft"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "inAirStand",
-                                                                                                    "var": "isInAirStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "INAIRRUN",
-                                                                                                    "var": "isInAirRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "landStandOnDone"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeRightHmd",
-                                                                                                    "var": "isMovingRightHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "strafeLeftHmd",
-                                                                                                    "var": "isMovingLeftHmd"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "seated",
-                                                                                                    "var": "isSeated"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "LANDRUN",
-                                                                                            "interpDuration": 2,
-                                                                                            "interpTarget": 2,
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "fly",
-                                                                                                    "var": "isFlying"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "takeoffStand",
-                                                                                                    "var": "isTakeoffStand"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "TAKEOFFRUN",
-                                                                                                    "var": "isTakeoffRun"
-                                                                                                },
-                                                                                                {
-                                                                                                    "state": "WALKFWD",
-                                                                                                    "var": "landRunOnDone"
-                                                                                                }
-                                                                                            ]
-                                                                                        },
-                                                                                        {
-                                                                                            "id": "seatedToIdle",
-                                                                                            "interpDuration": 10,
-                                                                                            "interpTarget": 1,
-                                                                                            "interpType": "snapshotPrev",
-                                                                                            "transitions": [
-                                                                                                {
-                                                                                                    "state": "idle",
-                                                                                                    "var": "seatedToIdleOnDone"
-                                                                                                }
-                                                                                            ]
-                                                                                        }
-                                                                                    ]
+                                                                                    "alpha": 0,
+                                                                                    "alphaVar": "lookBlendAlpha",
+                                                                                    "blendType": "addAbsolute"
                                                                                 },
-                                                                                "id": "mainStateMachine",
-                                                                                "type": "stateMachine"
+                                                                                "id": "lookAround",
+                                                                                "type": "blendLinear"
                                                                             }
                                                                         ],
                                                                         "data": {
@@ -5131,9 +6206,11 @@
             "currentState": "userAnimNone",
             "states": [
                 {
+                    "easingType": "easeInOutQuad",
                     "id": "userAnimNone",
-                    "interpDuration": 6,
-                    "interpTarget": 6,
+                    "interpDuration": 15,
+                    "interpTarget": 15,
+                    "interpType": "evaluateBoth",
                     "transitions": [
                         {
                             "state": "userAnimA",
@@ -5146,9 +6223,11 @@
                     ]
                 },
                 {
+                    "easingType": "easeInOutQuad",
                     "id": "userAnimA",
-                    "interpDuration": 6,
-                    "interpTarget": 6,
+                    "interpDuration": 15,
+                    "interpTarget": 15,
+                    "interpType": "evaluateBoth",
                     "transitions": [
                         {
                             "state": "userAnimNone",
@@ -5161,9 +6240,11 @@
                     ]
                 },
                 {
+                    "easingType": "easeInOutQuad",
                     "id": "userAnimB",
-                    "interpDuration": 6,
-                    "interpTarget": 6,
+                    "interpDuration": 15,
+                    "interpTarget": 15,
+                    "interpType": "evaluateBoth",
                     "transitions": [
                         {
                             "state": "userAnimNone",
diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 9b3c711c63..eb07c9a6dd 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -3,8 +3,10 @@
     "channels": [
         { "from": "Keyboard.A", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.D", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.E", "when": "!Keyboard.Control", "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.Q", "when": "!Keyboard.Control", "to": "Actions.LATERAL_LEFT" },
+        { "from": "Keyboard.E", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
+        { "from": "Keyboard.Q", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
+        { "from": "Keyboard.Q", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
+        { "from": "Keyboard.E", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.T", "when": "!Keyboard.Control", "to": "Actions.TogglePushToTalk" },
 
         { "comment" : "Mouse turn need to be small continuous increments",
@@ -39,7 +41,6 @@
             ]
         },
 
-
         { "from": { "makeAxis" : [
                 ["Keyboard.Left" ],
                 ["Keyboard.Right"]
@@ -85,6 +86,24 @@
           "when": ["Application.CameraThirdPerson", "!Keyboard.Shift"],
           "to": "Actions.Yaw"
         },
+        
+        { "from": { "makeAxis" : [
+                ["Keyboard.Left"],
+                ["Keyboard.Right"]
+             ]
+          },
+          "when": ["Application.CameraLookAt", "!Keyboard.Shift"],
+          "to": "Actions.Yaw"
+        },
+
+        { "from": { "makeAxis" : [
+                ["Keyboard.Left"],
+                ["Keyboard.Right"]
+             ]
+          },
+          "when": ["Application.CameraSelfie", "!Keyboard.Shift"],
+          "to": "Actions.Yaw"
+        },
 
         { "from": { "makeAxis" : [
                 ["Keyboard.A"],
@@ -104,6 +123,24 @@
           "to": "Actions.Yaw"
         },
         
+        { "from": { "makeAxis" : [
+                ["Keyboard.A"],
+                ["Keyboard.D"]
+             ]
+          },
+          "when": ["Application.CameraLookAt", "!Keyboard.Control"],
+          "to": "Actions.Yaw"
+        },
+
+        { "from": { "makeAxis" : [
+                ["Keyboard.A"],
+                ["Keyboard.D"]
+             ]
+          },
+          "when": ["Application.CameraSelfie", "!Keyboard.Control"],
+          "to": "Actions.Yaw"
+        },
+        
         { "from": { "makeAxis" : [
                 ["Keyboard.TouchpadLeft"],
                 ["Keyboard.TouchpadRight"]
@@ -122,6 +159,24 @@
           "to": "Actions.Yaw"
         },
         
+        { "from": { "makeAxis" : [
+                ["Keyboard.TouchpadLeft"],
+                ["Keyboard.TouchpadRight"]
+            ]
+          },
+          "when": "Application.CameraLookAt",
+          "to": "Actions.Yaw"
+        },
+        
+        { "from": { "makeAxis" : [
+                ["Keyboard.TouchpadLeft"],
+                ["Keyboard.TouchpadRight"]
+            ]
+          },
+          "when": "Application.CameraSelfie",
+          "to": "Actions.Yaw"
+        },
+
         { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
           "when": "Keyboard.RightMouseButton",
           "to": "Actions.DeltaYaw",
@@ -132,7 +187,7 @@
         },
 
         { "from": { "makeAxis" : ["Keyboard.MouseMoveUp", "Keyboard.MouseMoveDown"] },
-          "when": "Keyboard.RightMouseButton",
+          "when": ["!Application.CameraSelfie", "!Application.CameraLookAt", "Keyboard.RightMouseButton"],
           "to": "Actions.DeltaPitch",
           "filters":
             [
@@ -140,16 +195,40 @@
             ]
         },
 
-        { "from": "Keyboard.W", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_FORWARD" },
-        { "from": "Keyboard.S", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": { "makeAxis" : ["Keyboard.MouseMoveUp", "Keyboard.MouseMoveDown"] },
+          "when": ["Application.CameraLookAt", "Keyboard.RightMouseButton"],
+          "to": "Actions.DeltaPitch",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.2 }
+            ]
+        },
+
+        { "from": { "makeAxis" : ["Keyboard.MouseMoveDown", "Keyboard.MouseMoveUp"] },
+          "when": ["Application.CameraSelfie", "Keyboard.RightMouseButton"],
+          "to": "Actions.DeltaPitch",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.2 }
+            ]
+        },
+
+        { "from": "Keyboard.W", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.S", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": "Keyboard.S", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.W", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.Shift", "when": ["!Keyboard.Left", "!Keyboard.Right"], "to": "Actions.SPRINT" },
         { "from": "Keyboard.C", "when": "!Keyboard.Control", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.Left", "when": "Keyboard.Shift", "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.Right", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" },
         { "from": "Keyboard.Up", "when": "Application.CameraFirstPerson", "to": "Actions.LONGITUDINAL_FORWARD" },
         { "from": "Keyboard.Up", "when": "Application.CameraThirdPerson", "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.Up", "when": "Application.CameraLookAt", "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.Up", "when": "Application.CameraSelfie", "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.Down", "when": "Application.CameraFirstPerson", "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.Down", "when": "Application.CameraThirdPerson", "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": "Keyboard.Down", "when": "Application.CameraLookAt", "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": "Keyboard.Down", "when": "Application.CameraSelfie", "to": "Actions.LONGITUDINAL_FORWARD" },
 
         { "from": "Keyboard.PgDown", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.PgUp", "to": "Actions.VERTICAL_UP" },
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 0a5bd12460..195f909942 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -162,7 +162,14 @@
         { "from": "Standard.Head", "to": "Actions.Head" },
         { "from": "Standard.LeftArm", "to": "Actions.LeftArm" },
         { "from": "Standard.RightArm", "to": "Actions.RightArm" },
-        
+
+        { "from": "Standard.LeftEye", "to": "Actions.LeftEye" },
+        { "from": "Standard.RightEye", "to": "Actions.RightEye" },
+
+        { "from": "Standard.LeftEyeBlink", "to": "Actions.LeftEyeBlink" },
+        { "from": "Standard.RightEyeBlink", "to": "Actions.RightEyeBlink" },
+
+
         { "from": "Standard.TrackedObject00", "to" : "Actions.TrackedObject00" },
         { "from": "Standard.TrackedObject01", "to" : "Actions.TrackedObject01" },
         { "from": "Standard.TrackedObject02", "to" : "Actions.TrackedObject02" },
diff --git a/interface/resources/controllers/standard_nomovement.json b/interface/resources/controllers/standard_nomovement.json
index 015bc33056..602d3bb798 100644
--- a/interface/resources/controllers/standard_nomovement.json
+++ b/interface/resources/controllers/standard_nomovement.json
@@ -57,7 +57,13 @@
         { "from": "Standard.Head", "to": "Actions.Head" },
         { "from": "Standard.LeftArm", "to": "Actions.LeftArm" },
         { "from": "Standard.RightArm", "to": "Actions.RightArm" },
-        
+
+        { "from": "Standard.LeftEye", "to": "Actions.LeftEye" },
+        { "from": "Standard.RightEye", "to": "Actions.RightEye" },
+
+        { "from": "Standard.LeftEyeBlink", "to": "Actions.LeftEyeBlink" },
+        { "from": "Standard.RightEyeBlink", "to": "Actions.RightEyeBlink" },
+
         { "from": "Standard.TrackedObject00", "to" : "Actions.TrackedObject00" },
         { "from": "Standard.TrackedObject01", "to" : "Actions.TrackedObject01" },
         { "from": "Standard.TrackedObject02", "to" : "Actions.TrackedObject02" },
diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index 730e1bcb58..b6fae1dd79 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -54,8 +54,52 @@
         { "from": "Vive.RightApplicationMenu", "to": "Standard.RightSecondaryThumb" },
 
         { "from": "Vive.LeftHand", "to": "Standard.LeftHand" },
+        { "from": "Vive.LeftHandThumb1", "to": "Standard.LeftHandThumb1"},
+        { "from": "Vive.LeftHandThumb2", "to": "Standard.LeftHandThumb2"},
+        { "from": "Vive.LeftHandThumb3", "to": "Standard.LeftHandThumb3"},
+        { "from": "Vive.LeftHandThumb4", "to": "Standard.LeftHandThumb4"},
+        { "from": "Vive.LeftHandIndex1", "to": "Standard.LeftHandIndex1"},
+        { "from": "Vive.LeftHandIndex2", "to": "Standard.LeftHandIndex2"},
+        { "from": "Vive.LeftHandIndex3", "to": "Standard.LeftHandIndex3"},
+        { "from": "Vive.LeftHandIndex4", "to": "Standard.LeftHandIndex4"},
+        { "from": "Vive.LeftHandMiddle1", "to": "Standard.LeftHandMiddle1"},
+        { "from": "Vive.LeftHandMiddle2", "to": "Standard.LeftHandMiddle2"},
+        { "from": "Vive.LeftHandMiddle3", "to": "Standard.LeftHandMiddle3"},
+        { "from": "Vive.LeftHandMiddle4", "to": "Standard.LeftHandMiddle4"},
+        { "from": "Vive.LeftHandRing1", "to": "Standard.LeftHandRing1"},
+        { "from": "Vive.LeftHandRing2", "to": "Standard.LeftHandRing2"},
+        { "from": "Vive.LeftHandRing3", "to": "Standard.LeftHandRing3"},
+        { "from": "Vive.LeftHandRing4", "to": "Standard.LeftHandRing4"},
+        { "from": "Vive.LeftHandPinky1", "to": "Standard.LeftHandPinky1"},
+        { "from": "Vive.LeftHandPinky2", "to": "Standard.LeftHandPinky2"},
+        { "from": "Vive.LeftHandPinky3", "to": "Standard.LeftHandPinky3"},
+        { "from": "Vive.LeftHandPinky4", "to": "Standard.LeftHandPinky4"},
         { "from": "Vive.RightHand", "to": "Standard.RightHand" },
+        { "from": "Vive.RightHandThumb1", "to": "Standard.RightHandThumb1"},
+        { "from": "Vive.RightHandThumb2", "to": "Standard.RightHandThumb2"},
+        { "from": "Vive.RightHandThumb3", "to": "Standard.RightHandThumb3"},
+        { "from": "Vive.RightHandThumb4", "to": "Standard.RightHandThumb4"},
+        { "from": "Vive.RightHandIndex1", "to": "Standard.RightHandIndex1"},
+        { "from": "Vive.RightHandIndex2", "to": "Standard.RightHandIndex2"},
+        { "from": "Vive.RightHandIndex3", "to": "Standard.RightHandIndex3"},
+        { "from": "Vive.RightHandIndex4", "to": "Standard.RightHandIndex4"},
+        { "from": "Vive.RightHandMiddle1", "to": "Standard.RightHandMiddle1"},
+        { "from": "Vive.RightHandMiddle2", "to": "Standard.RightHandMiddle2"},
+        { "from": "Vive.RightHandMiddle3", "to": "Standard.RightHandMiddle3"},
+        { "from": "Vive.RightHandMiddle4", "to": "Standard.RightHandMiddle4"},
+        { "from": "Vive.RightHandRing1", "to": "Standard.RightHandRing1"},
+        { "from": "Vive.RightHandRing2", "to": "Standard.RightHandRing2"},
+        { "from": "Vive.RightHandRing3", "to": "Standard.RightHandRing3"},
+        { "from": "Vive.RightHandRing4", "to": "Standard.RightHandRing4"},
+        { "from": "Vive.RightHandPinky1", "to": "Standard.RightHandPinky1"},
+        { "from": "Vive.RightHandPinky2", "to": "Standard.RightHandPinky2"},
+        { "from": "Vive.RightHandPinky3", "to": "Standard.RightHandPinky3"},
+        { "from": "Vive.RightHandPinky4", "to": "Standard.RightHandPinky4"},
         { "from": "Vive.Head", "to" : "Standard.Head" },
+        { "from": "Vive.LeftEye", "to" : "Standard.LeftEye" },
+        { "from": "Vive.RightEye", "to" : "Standard.RightEye" },
+        { "from": "Vive.LeftEyeBlink", "to" : "Standard.LeftEyeBlink" },
+        { "from": "Vive.RightEyeBlink", "to" : "Standard.RightEyeBlink" },
 
         {
             "from": "Vive.LeftFoot", "to" : "Standard.LeftFoot",
diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html
index 1140f045db..e83c0cc388 100644
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 High Fidelity, Inc. -->
+<!-- Copyright 2016 High Fidelity, Inc. -->
 <html>
     <head>
         <meta charset="utf-8"/>
@@ -77,9 +77,9 @@
             var handControllerImageURL = null;
             var index = 0;
             var count = 3;
-			var handControllerRefURL = "https://docs.highfidelity.com/en/rc81/explore/get-started/vr-controls.html#vr-controls";
-			var keyboardRefURL = "https://docs.highfidelity.com/en/rc81/explore/get-started/desktop.html#movement-controls";
-			var gamepadRefURL = "https://docs.highfidelity.com/en/rc81/explore/get-started/vr-controls.html#gamepad";
+			var handControllerRefURL = "https://docs.highfidelity.com/explore/get-started/vr-controls.html#vr-controls";
+			var keyboardRefURL = "https://docs.highfidelity.com/explore/get-started/desktop.html#movement-controls";
+			var gamepadRefURL = "https://docs.highfidelity.com/explore/get-started/vr-controls.html#gamepad";
 
             function showKbm() {
                 document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
diff --git a/interface/resources/images/high-fidelity-banner.svg b/interface/resources/images/high-fidelity-banner.svg
index d5666be0fa..19127e729c 100644
--- a/interface/resources/images/high-fidelity-banner.svg
+++ b/interface/resources/images/high-fidelity-banner.svg
@@ -1,17 +1 @@
-<svg width="360" height="85" viewBox="0 0 360 85" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M124 30V59H117.974V46.3455H108.026V59H102V30H108.026V41.1899H117.974V30H124Z" fill="#00B4F0"/>
-<path d="M135 59H129V30H135V59Z" fill="#00B4F0"/>
-<path d="M151.829 34.9471C150.406 34.9471 149.211 35.0608 148.187 35.3451C147.22 35.6294 146.423 36.0843 145.797 36.7098C145.171 37.3353 144.772 38.2451 144.488 39.3255C144.203 40.4059 144.089 41.7706 144.089 43.3627V45.9216C144.089 47.6275 144.203 48.9922 144.431 50.0726C144.659 51.1529 145.057 52.0059 145.626 52.5745C146.138 53.2 146.878 53.598 147.732 53.8255C148.585 54.0529 149.667 54.1667 150.919 54.1667C151.26 54.1667 151.659 54.1667 152.057 54.1098C152.455 54.1098 152.854 54.0529 153.309 53.9961V46.3765H149.78L150.35 41.7137H159V57.749C157.919 58.1471 156.553 58.4314 154.902 58.6588C153.309 58.8863 151.602 59 149.894 59C147.732 59 145.911 58.7157 144.431 58.2039C142.894 57.6922 141.699 56.8961 140.732 55.8157C139.764 54.7353 139.081 53.4275 138.626 51.7784C138.171 50.1863 138 48.2529 138 46.0922V43.1922C138 41.202 138.228 39.4392 138.626 37.7902C139.081 36.1412 139.821 34.7765 140.846 33.6392C141.87 32.502 143.236 31.5922 144.886 30.9667C146.537 30.3412 148.642 30 151.146 30C152.512 30 153.878 30.1137 155.187 30.3412C156.496 30.5686 157.577 30.8529 158.431 31.1373L157.463 35.6863C156.724 35.4588 155.87 35.2882 154.959 35.1176C154.049 35.0039 153.024 34.9471 151.829 34.9471Z" fill="#00B4F0"/>
-<path d="M187 30V59H180.959V46.3455H171.041V59H165V30H171.041V41.1899H181.016V30H187Z" fill="#00B4F0"/>
-<path d="M218 30L217.366 35.0384H207.597V41.0727H216.627L215.993 46.1111H207.597V59H202V30H218Z" fill="#00B4F0"/>
-<path d="M229 59H223V30H229V59Z" fill="#00B4F0"/>
-<path d="M233 30H242.404C244.842 30 246.873 30.3508 248.499 30.994C250.124 31.6371 251.401 32.5726 252.388 33.6835C253.375 34.8528 254.013 36.1976 254.42 37.8347C254.826 39.4718 255 41.2258 255 43.0968V45.8448C255 47.7742 254.826 49.5282 254.42 51.1653C254.013 52.8024 253.317 54.1472 252.388 55.3165C251.401 56.4859 250.124 57.3629 248.499 58.006C246.873 58.6492 244.842 59 242.404 59H233.058V30H233ZM239.095 53.9133H241.765C242.926 53.9133 243.913 53.7964 244.842 53.504C245.712 53.2117 246.467 52.744 247.047 52.1008C247.628 51.4577 248.034 50.5806 248.325 49.5282C248.615 48.4758 248.731 47.1311 248.731 45.494V43.3306C248.731 41.6935 248.615 40.3488 248.325 39.2964C248.034 38.2439 247.628 37.3669 247.047 36.7238C246.467 36.0806 245.77 35.6129 244.842 35.379C243.971 35.1452 242.926 34.9698 241.765 34.9698H239.095V53.9133Z" fill="#00B4F0"/>
-<path d="M275.945 30L275.34 34.8528H264.832V41.1673H274.735L274.184 46.0202H264.887V54.1472H276L275.395 59H259V30H275.945Z" fill="#00B4F0"/>
-<path d="M286.215 30V53.9616H298L297.296 59H280V30H286.215Z" fill="#00B4F0"/>
-<path d="M307 59H302V30H307V59Z" fill="#00B4F0"/>
-<path d="M334 30L333.307 35.0384H325.563V59H319.437V35.0384H311L311.693 30H334Z" fill="#00B4F0"/>
-<path d="M347.617 41.3071L353.633 30H360L350.537 46.3455V59H344.346V46.3455L335 30H341.776L347.617 41.3071Z" fill="#00B4F0"/>
-<path d="M42.1132 85C36.4528 85 30.9057 83.856 25.7547 81.6824C20.717 79.5659 16.2453 76.4771 12.3962 72.5875C8.54717 68.6978 5.49057 64.1218 3.39623 59.0882C1.13208 53.7685 -1.07963e-07 48.22 -1.07963e-07 42.4428C-1.07963e-07 36.7227 1.13208 31.1171 3.28302 25.9118C5.37736 20.821 8.43396 16.3022 12.283 12.4125C16.1321 8.52288 20.6604 5.43405 25.6415 3.31763C30.8491 1.08681 36.3396 1.09101e-07 42 1.09101e-07C47.6604 1.09101e-07 53.2076 1.14401 58.3585 3.31763C63.3962 5.43405 67.8679 8.52288 71.717 12.4125C75.566 16.3022 78.6227 20.8782 80.717 25.9118C82.9245 31.1743 84 36.7227 84 42.4428C84 48.1628 82.8679 53.7685 80.717 58.9737C78.6227 64.0646 75.566 68.5834 71.717 72.4731C67.8679 76.3627 63.3396 79.4515 58.3585 81.568C53.3208 83.856 47.7736 85 42.1132 85ZM42.1132 4.34724C21.3396 4.34724 4.41509 21.4502 4.41509 42.4428C4.41509 63.4354 21.3396 80.5384 42.1132 80.5384C62.8868 80.5384 79.8113 63.4354 79.8113 42.4428C79.8113 21.4502 62.8868 4.34724 42.1132 4.34724Z" fill="#00B4F0"/>
-<path d="M54.8 60.7368V30.5158C56.6857 29.8789 58 28.0842 58 26C58 23.3947 55.8857 21.2526 53.3143 21.2526C50.7429 21.2526 48.6286 23.3947 48.6286 26C48.6286 28.0263 49.8286 29.7053 51.6 30.4579V44.5263L32.1714 35.379V24.2632C34.0571 23.6263 35.3714 21.8316 35.3714 19.7474C35.3714 17.1421 33.2571 15 30.6857 15C28.1143 15 26 17.1421 26 19.7474C26 21.7737 27.2 23.4526 28.9714 24.2053V54.6C27.2571 55.2947 26 57.0316 26 59.0579C26 61.6632 28.1143 63.8053 30.6857 63.8053C33.2571 63.8053 35.3714 61.6632 35.3714 59.0579C35.3714 56.9737 34.0571 55.1789 32.1714 54.5421V39.2L51.6 48.3474V60.7947C49.8857 61.4895 48.6286 63.2263 48.6286 65.2526C48.6286 67.8579 50.7429 70 53.3143 70C55.8857 70 58 67.8579 58 65.2526C58 63.1105 56.6857 61.3737 54.8 60.7368Z" fill="#00B4F0"/>
-</svg>
-
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 120.9"><defs><style>.cls-1{fill:#fff;}</style></defs><title>Artboard 1</title><polygon class="cls-1" points="28.69 60.97 28.69 81.59 10.31 81.59 10.31 60.97 0 60.97 0 108.64 10.31 108.64 10.31 89.81 28.69 89.81 28.69 108.64 39 108.64 39 60.97 28.69 60.97"/><path class="cls-1" d="M45,75.17h9.27v33.47H45Zm-.6-9.57a5.31,5.31,0,1,1,5.53,5.08h-.3a5,5,0,0,1-5.23-4.93V65.6"/><path class="cls-1" d="M96.84,61h9.26V80.55c1.65-3.29,5.38-6.13,10.91-6.13,6.58,0,11.21,4,11.21,12.85v21.22H119V88.62c0-4.49-1.79-6.73-5.82-6.73s-7,2.54-7,7.47v19.28H96.84Z"/><polygon class="cls-1" points="145.41 60.97 174.69 60.97 174.69 69.04 155.72 69.04 155.72 83.09 173.05 83.09 173.05 90.86 155.72 90.86 155.72 108.64 145.41 108.64 145.41 60.97"/><path class="cls-1" d="M178.88,75.17h9.26v33.47h-9.26Zm-.75-9.57a5.32,5.32,0,0,1,5.08-5.53,5.25,5.25,0,0,1,5.53,5.09,5.31,5.31,0,0,1-5.08,5.52h-.3a5,5,0,0,1-5.23-4.93V65.6"/><path class="cls-1" d="M216.84,92.05v-.44c0-6.73-3-10-8.07-10S200.7,85,200.7,91.76v.44c0,6.73,3.14,9.87,7.77,9.87,4.93,0,8.37-3.14,8.37-10m-25.56.3v-.44c0-11.06,6.28-17.49,14.65-17.49,5.38,0,8.67,2.39,10.61,5.68V61h9.26v47.67h-9.26v-5.53a12.19,12.19,0,0,1-10.76,6.28c-8.07,0-14.5-5.83-14.5-17"/><path class="cls-1" d="M82.94,91v-.45c0-5.68-3-9.12-8.07-9.12s-8.07,3.74-8.07,9.27v.45c0,5.53,3.29,9,7.92,9,4.78,0,8.22-3.43,8.22-9.11M57.53,109.39H66.8c.6,3,2.69,4.78,7.47,4.78,5.68,0,8.52-3,8.52-8.22v-5.08A12.69,12.69,0,0,1,72,107.15c-8.07,0-14.65-6.13-14.65-16v-.45c0-9.56,6.43-16.29,14.65-16.29,5.38,0,8.67,2.39,10.61,5.68V75.17h9.27V106c0,9.87-6.58,15-17.64,15s-15.69-4.64-16.74-11.51"/><path class="cls-1" d="M253.45,88.32c-.3-5.08-2.84-7.47-7.32-7.47-4.19,0-7,2.69-7.62,7.47Zm-24.51,4v-.44c0-10.61,7.47-17.34,17.19-17.34,8.66,0,16.29,5.08,16.29,17v2.54H238.36c.3,5.53,3.28,8.81,8.36,8.81,4.34,0,6.43-1.79,7-4.63h8.82c-1.05,7.17-6.88,11.21-16,11.21-10.32-.15-17.64-6.58-17.64-17.19"/><rect class="cls-1" x="265.85" y="60.97" width="9.27" height="47.67"/><path class="cls-1" d="M280.2,75.17h9.26v33.47H280.2Zm-.75-9.57A5.31,5.31,0,1,1,285,70.68h-.3a5,5,0,0,1-5.23-4.93V65.6"/><path class="cls-1" d="M294.25,98.63V67.85h9.26V75h7v6.57h-7V97.73c0,2.69,1.35,4,3.74,4a10,10,0,0,0,3.58-.6v7.17a18,18,0,0,1-5.67.9c-7.18-.15-10.91-3.74-10.91-10.61"/><polygon class="cls-1" points="338.03 75.02 330.56 95.19 322.49 75.02 312.48 75.02 325.78 105.06 319.95 119.85 328.92 119.85 347 75.02 338.03 75.02"/><path class="cls-1" d="M336.54,31.68,323.09,25.4V18.08a3.52,3.52,0,0,0,2.39-4.18,3.41,3.41,0,0,0-6.58,1.79,3.5,3.5,0,0,0,2.4,2.39V38.41A3.4,3.4,0,1,0,323.09,45a3.4,3.4,0,0,0,0-6.57V27.65l13.45,6.27v8.67a3.41,3.41,0,0,0,1.79,6.58A3.46,3.46,0,0,0,340.72,45a3.5,3.5,0,0,0-2.39-2.39V22.27a3.53,3.53,0,0,0,2.39-4.19,3.41,3.41,0,1,0-6.57,1.8,3.5,3.5,0,0,0,2.39,2.39Z"/><path class="cls-1" d="M329.81,1.94a28.25,28.25,0,1,0,28.25,28.25h0A28.33,28.33,0,0,0,329.81,1.94m0,58.58A30.26,30.26,0,1,1,360,30.19h0a30.33,30.33,0,0,1-30.19,30.33"/></svg>
\ No newline at end of file
diff --git a/interface/resources/qml/Web3DSurface.qml b/interface/resources/qml/Web3DSurface.qml
index 32c19daf14..ff574ceaa5 100644
--- a/interface/resources/qml/Web3DSurface.qml
+++ b/interface/resources/qml/Web3DSurface.qml
@@ -12,20 +12,35 @@ import QtQuick 2.5
 
 import "controls" as Controls
 
-Controls.WebView {
+Item {
+    id: root
+    anchors.fill: parent
+    property string url: ""
+    property string scriptUrl: null
 
-    // This is for JS/QML communication, which is unused in a Web3DOverlay,
-    // but not having this here results in spurious warnings about a
-    // missing signal
-    signal sendToScript(var message);
+    onUrlChanged: {
+        load(root.url, root.scriptUrl);
+    }
 
-    function onWebEventReceived(event) {
-        if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") {
-            ApplicationInterface.addAssetToWorldFromURL(event.slice(18));
+    onScriptUrlChanged: {
+        if (root.item) {
+            root.item.scriptUrl = root.scriptUrl;
+        } else {
+            load(root.url, root.scriptUrl);
         }
     }
 
+    property var item: null
+
+    function load(url, scriptUrl) {
+        QmlSurface.load("./controls/WebView.qml", root, function(newItem) {
+            root.item = newItem
+            root.item.url = url
+            root.item.scriptUrl = scriptUrl
+        })
+    }
+
     Component.onCompleted: {
-        eventBridge.webEventReceived.connect(onWebEventReceived);
+        load(root.url, root.scriptUrl);
     }
 }
diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index d3bf6aca0a..fccba12a8a 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -266,6 +266,7 @@ Rectangle {
                     labelTextSize: 16;
                     backgroundOnColor: "#E3E3E3";
                     checked: AudioScriptingInterface.warnWhenMuted;
+                    visible: bar.currentIndex !== 0;
                     onClicked: {
                         AudioScriptingInterface.warnWhenMuted = checked;
                         checked = Qt.binding(function() { return AudioScriptingInterface.warnWhenMuted; }); // restore binding
@@ -277,8 +278,8 @@ Rectangle {
                     id: audioLevelSwitch
                     height: root.switchHeight;
                     switchWidth: root.switchWidth;
-                    anchors.top: warnMutedSwitch.bottom
-                    anchors.topMargin: 24
+                    anchors.top: warnMutedSwitch.visible ? warnMutedSwitch.bottom : parent.top
+                    anchors.topMargin: bar.currentIndex === 0 ? 0 : 24
                     anchors.left: parent.left
                     labelTextOn: qsTr("Audio Level Meter");
                     labelTextSize: 16;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index 213540b334..87f307b9bc 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -106,7 +106,7 @@ Rectangle {
         }
         RalewayRegular {
             color: "white"
-            text: "© 2018 High Fidelity. All rights reserved."
+            text: "© 2012 - 2019 High Fidelity, Inc.. All rights reserved."
             size: 14
         }
         RalewayRegular {
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index a7a0d461a2..b1f62633e7 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -240,9 +240,96 @@ Rectangle {
             }
         }
 
+        // -- Plugin Permissions --
+        Item {
+            id: kpiContainer;
+            anchors.top: accountContainer.bottom;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: childrenRect.height;
+
+            Rectangle {
+                id: kpiHeaderContainer;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 55;
+                color: hifi.colors.baseGrayHighlight;
+
+                HifiStylesUit.RalewaySemiBold {
+                    text: "Plugin Permissions";
+                    anchors.fill: parent;
+                    anchors.leftMargin: 20;
+                    color: hifi.colors.white;
+                    size: 18;
+                }
+            }
+
+            Item {
+                id: kpiScriptContainer;
+                anchors.top: kpiHeaderContainer.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;
+
+                HifiControlsUit.CheckBox {
+                    id: kpiScriptCheckbox;
+                    readonly property string kpiSettingsKey: "private/enableScriptingPlugins"
+                    checked: Settings.getValue(kpiSettingsKey, false);
+                    text: "Enable custom script plugins (requires restart)"
+                    // Anchors
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 20;
+                    boxSize: 24;
+                    labelFontSize: 18;
+                    colorScheme: hifi.colorSchemes.dark
+                    color: hifi.colors.white;
+                    width: 300;
+                    onCheckedChanged: Settings.setValue(kpiSettingsKey, checked);
+                }
+
+                HifiStylesUit.RalewaySemiBold {
+                    id: kpiScriptHelp;
+                    text: '[?]';
+                    // Anchors
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.left: kpiScriptCheckbox.right;
+                    width: 30;
+                    height: 30;
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.blueHighlight;
+
+                    MouseArea {
+                        anchors.fill: parent;
+                        hoverEnabled: true;
+                        onEntered: {
+                            parent.color = hifi.colors.blueAccent;
+                        }
+                        onExited: {
+                            parent.color = hifi.colors.blueHighlight;
+                        }
+                        onClicked: {
+                            lightboxPopup.titleText = "Script Plugin Infrastructure by Kasen";
+                            lightboxPopup.bodyText = "Toggles the activation of scripting plugins in the 'plugins/scripting' folder. \n\n"
+                              + "Created by https://kasen.io/";
+                            lightboxPopup.button1text = "OK";
+                            lightboxPopup.button1method = function() {
+                                lightboxPopup.visible = false;
+                            }
+                            lightboxPopup.visible = true;
+                        }
+                    }
+                }
+            }
+        }
+
+
         Item {
             id: walletContainer;
-            anchors.top: accountContainer.bottom;
+            anchors.top: kpiContainer.bottom;
             anchors.left: parent.left;
             anchors.right: parent.right;
             height: childrenRect.height;
diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
index 4a36232029..a4a6575d1e 100644
--- a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
@@ -167,7 +167,7 @@ Flickable {
                 Component.onCompleted: {
                     var cpu = JSON.parse(PlatformInfo.getCPU(0));
                     var cpuModel = cpu.model;
-                    if (cpuModel.length === 0) {
+                    if (!cpuModel || cpuModel.length === 0) {
                         cpuModel = "Unknown";
                     }
 
@@ -213,7 +213,7 @@ Flickable {
                 Component.onCompleted: {
                     var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
                     var gpuModel = gpu.model;
-                    if (gpuModel.length === 0) {
+                    if (!gpuModel || gpuModel.length === 0) {
                         gpuModel = "Unknown";
                     }
 
@@ -327,7 +327,7 @@ Flickable {
 
         var cpu = JSON.parse(PlatformInfo.getCPU(0));
         var cpuModel = cpu.model;
-        if (cpuModel.length === 0) {
+        if (!cpuModel || cpuModel.length === 0) {
             cpuModel = "Unknown";
         }
 
@@ -338,7 +338,7 @@ Flickable {
         
         var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
         var gpuModel = gpu.model;
-        if (gpuModel.length === 0) {
+        if (!gpuModel || gpuModel.length === 0) {
             gpuModel = "Unknown";
         }
 
diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
index b647d5ca24..84b37db31b 100644
--- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
@@ -699,8 +699,8 @@ Item {
                 spacing: controlsTableRoot.rowPadding
 
                 HifiStylesUit.GraphikRegular {
-                    id: mirrorText
-                    text: "Mirror Mode"
+                    id: selfieText
+                    text: "Selfie"
                     width: paintedWidth
                     height: parent.height
                     horizontalAlignment: Text.AlignLeft
@@ -710,8 +710,8 @@ Item {
                 }
 
                 HifiStylesUit.GraphikRegular {
-                    text: "See your own avatar"
-                    width: parent.width - mirrorText.width - parent.spacing - controlsTableRoot.rowPadding
+                    text: "Look at self"
+                    width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding
                     height: parent.height
                     horizontalAlignment: Text.AlignLeft
                     verticalAlignment: Text.AlignVCenter
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
index 9e58a0aa98..7a98849b95 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
@@ -136,17 +136,17 @@ Flickable {
                     Layout.preferredHeight: 18
                     Layout.preferredWidth: parent.width
                     labelTextOn: "Show Emote UI"
-                    checked: Settings.getValue("simplifiedUI/emoteIndicatorVisible", true)
+                    checked: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
                     onClicked: {
-                        var currentSetting = Settings.getValue("simplifiedUI/emoteIndicatorVisible", true);
-                        Settings.setValue("simplifiedUI/emoteIndicatorVisible", !currentSetting);
+                        var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true);
+                        Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting);
                     }                    
 
                     Connections {
                         target: Settings
 
                         onValueChanged: {
-                            if (setting === "simplifiedUI/emoteIndicatorVisible") {
+                            if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
                                 emoteSwitch.checked = value;
                             }
                         }
@@ -234,9 +234,19 @@ Flickable {
                 SimplifiedControls.RadioButton {
                     id: thirdPerson
                     text: "Third Person View"
-                    checked: Camera.mode === "third person"
+                    checked: Camera.mode === "look at"
                     onClicked: {
-                        Camera.mode = "third person"
+                        Camera.mode = "look at"
+                    }
+                }
+
+                SimplifiedControls.RadioButton {
+                    id: selfie
+                    text: "Selfie"
+                    checked: Camera.mode === "selfie"
+                    visible: true
+                    onClicked: {
+                        Camera.mode = "selfie"
                     }
                 }
                 
@@ -246,11 +256,21 @@ Flickable {
                     onModeUpdated: {
                         if (Camera.mode === "first person") {
                             firstPerson.checked = true
-                        } else if (Camera.mode === "third person") {
+                        } else if (Camera.mode === "look at") {
                             thirdPerson.checked = true
+                        } else if (Camera.mode === "selfie" && HMD.active) {
+                            selfie.checked = true
                         }
                     }
                 }
+
+                Connections {
+                    target: HMD
+
+                    onDisplayModeChanged: {
+                        selfie.visible = isHMDMode ? false : true
+                    }
+                }
             }
         }
 
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
index 5f0fbe49d5..420ee11a05 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
@@ -71,7 +71,7 @@ Flickable {
         ColumnLayout {
             id: controlsContainer
             Layout.preferredWidth: parent.width
-        Layout.topMargin: 24
+            Layout.topMargin: 24
             spacing: 0
 
             HifiStylesUit.GraphikSemiBold {
@@ -154,6 +154,45 @@ Flickable {
                 }
             }
         }
+
+        ColumnLayout {
+            Layout.preferredWidth: parent.width
+            spacing: 0
+
+            HifiStylesUit.GraphikSemiBold {
+                text: "VR Rotation Mode"
+                Layout.preferredWidth: parent.width
+                height: paintedHeight
+                size: 22
+                color: simplifiedUI.colors.text.white
+            }
+
+            ColumnLayout {
+                width: parent.width
+                Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
+                spacing: simplifiedUI.margins.settings.spacingBetweenRadiobuttons
+
+                ButtonGroup { id: rotationButtonGroup }
+
+                SimplifiedControls.RadioButton {
+                    text: "Snap Turn"
+                    ButtonGroup.group: rotationButtonGroup
+                    checked: MyAvatar.getSnapTurn() === true
+                    onClicked: {
+                        MyAvatar.setSnapTurn(true);
+                    }
+                }
+
+                SimplifiedControls.RadioButton {
+                    text: "Smooth Turn"
+                    ButtonGroup.group: rotationButtonGroup
+                    checked: MyAvatar.getSnapTurn() === false
+                    onClicked: {
+                        MyAvatar.setSnapTurn(false);
+                    }
+                }
+            }
+        }
         
         ColumnLayout {
             id: micControlsContainer
diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml
index bd2b6cf538..44f34c3356 100644
--- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml
@@ -22,6 +22,10 @@ TextField {
     }
 
     property string rightGlyph: ""
+    property alias bottomBorderVisible: bottomRectangle.visible
+    property alias backgroundColor: textFieldBackground.color
+    property string unfocusedPlaceholderText
+    property bool blankPlaceholderTextOnFocus: true
 
     color: simplifiedUI.colors.text.white
     font.family: "Graphik Medium"
@@ -35,10 +39,8 @@ TextField {
     leftPadding: 0
     rightPadding: root.rightGlyph === "" ? 0 : rightGlyphItem.implicitWidth + simplifiedUI.sizes.controls.textField.rightGlyphPadding
 
-    onFocusChanged: {
-        if (focus) {
-            Tablet.playSound(TabletEnums.ButtonClick);
-        }
+    onPressed: {
+        Tablet.playSound(TabletEnums.ButtonClick);
     }
 
     onHoveredChanged: {
@@ -47,7 +49,22 @@ TextField {
         }
     }
 
-    background: Item {
+    onFocusChanged: {
+        if (!root.blankPlaceholderTextOnFocus) {
+            return;
+        }
+
+        if (focus) {
+            root.unfocusedPlaceholderText = root.placeholderText;
+            root.placeholderText = "";
+        } else {
+            root.placeholderText = root.unfocusedPlaceholderText;
+        }
+    }
+
+    background: Rectangle {
+        id: textFieldBackground
+        color: Qt.rgba(0, 0, 0, 0);
         anchors.fill: parent
 
         Rectangle {
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index d87431ea9c..c92da7e6e5 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -9,6 +9,7 @@
 //
 
 import QtQuick 2.10
+import hifi.simplifiedUI.simplifiedControls 1.0 as SimplifiedControls
 import "../simplifiedConstants" as SimplifiedConstants
 import "../inputDeviceButton" as InputDeviceButton
 import stylesUit 1.0 as HifiStylesUit
@@ -39,6 +40,9 @@ Rectangle {
     property bool inventoryFullyReceived: false
 
     Component.onCompleted: {
+        var numTimesRun = Settings.getValue("simplifiedUI/SUIScriptExecutionCount", 0);
+        numTimesRun++;
+        Settings.setValue("simplifiedUI/SUIScriptExecutionCount", numTimesRun);
         Commerce.getLoginStatus();
     }
 
@@ -51,7 +55,7 @@ Rectangle {
             if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
                 topBarInventoryModel.count > 0) {
                 Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
-                MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
+                MyAvatar.useFullAvatarURL = topBarInventoryModel.get(0).download_url;
             }
         }
     }
@@ -157,7 +161,7 @@ Rectangle {
 
         Image {
             id: avatarButtonImage
-            source: "./images/defaultAvatar.svg"
+            source: "../images/defaultAvatar.svg"
             anchors.centerIn: parent
             width: 32
             height: width
@@ -350,6 +354,50 @@ Rectangle {
     }
 
 
+    TextMetrics {
+        id: goToTextFieldMetrics
+        font: goToTextField.font
+        text: goToTextField.longPlaceholderText
+    }
+
+
+    Item {
+        id: goToTextFieldContainer
+        anchors.left: statusButtonContainer.right
+        anchors.leftMargin: 12
+        anchors.right: (hmdButtonContainer.visible ? hmdButtonContainer.left : helpButtonContainer.left)
+        anchors.rightMargin: 12
+        anchors.verticalCenter: parent.verticalCenter
+        height: parent.height
+
+        SimplifiedControls.TextField {
+            id: goToTextField
+            readonly property string shortPlaceholderText: "Jump to..."
+            readonly property string longPlaceholderText: "Type the name of a location to quickly jump there..."
+            anchors.centerIn: parent
+            width: Math.min(parent.width, 445)
+            height: 35
+            leftPadding: 8
+            rightPadding: 8
+            bottomBorderVisible: false
+            backgroundColor: "#1D1D1D"
+            placeholderTextColor: "#8E8E8E"
+            font.pixelSize: 14
+            placeholderText: width - leftPadding - rightPadding < goToTextFieldMetrics.width ? shortPlaceholderText : longPlaceholderText
+            clip: true
+            selectByMouse: true
+            autoScroll: true
+            onAccepted: {
+                if (goToTextField.length > 0) {
+                    AddressManager.handleLookupString(goToTextField.text);
+                    goToTextField.text = "";
+                }
+                parent.forceActiveFocus();
+            }
+        }
+    }
+
+
 
     Item {
         id: hmdButtonContainer
diff --git a/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml b/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml
index 050515da37..e600924b42 100644
--- a/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml
+++ b/interface/resources/qml/hifi/tablet/+webengine/BlocksWebView.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtWebEngine 1.5
-import "../../controls" as Controls
+import "../../../controls" as Controls
 
 Controls.TabletWebView {
 	profile: WebEngineProfile { httpUserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36"}  
diff --git a/interface/resources/qml/hifi/tablet/DynamicWebview.qml b/interface/resources/qml/hifi/tablet/DynamicWebview.qml
new file mode 100644
index 0000000000..4343e71e64
--- /dev/null
+++ b/interface/resources/qml/hifi/tablet/DynamicWebview.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+import "../../controls" as Controls
+
+Controls.WebView {
+    id: root
+    function fromScript(message) {
+        root.url = message.url;
+    }
+}
+
+
diff --git a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
index 254e4203ce..1d15fe8b23 100644
--- a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
+++ b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
@@ -19,6 +19,7 @@ StackView {
     objectName: "stack"
     property string title: "General Settings"
     property alias gotoPreviousApp: root.gotoPreviousApp;
+    property alias gotoPreviousAppFromScript: root.gotoPreviousAppFromScript;
     signal sendToScript(var message);
 
     function pushSource(path) {
@@ -30,6 +31,10 @@ StackView {
         profileRoot.pop();
     }
 
+    function emitSendToScript(message) {
+        profileRoot.sendToScript(message);
+    }
+
     TabletPreferencesDialog {
         id: root
         objectName: "TabletGeneralPreferences"
diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index 5559c36fd1..6001497743 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -104,6 +104,10 @@ Rectangle {
 	            if (loader.item.hasOwnProperty("gotoPreviousApp")) {
 	                loader.item.gotoPreviousApp = true;
 	            }
+
+                if (loader.item.hasOwnProperty("gotoPreviousAppFromScript")) {
+                    loader.item.gotoPreviousAppFromScript = true;
+                }
             });
         }
     }
@@ -276,7 +280,7 @@ Rectangle {
                 } else {
                     console.log("newSource is of unknown type!");
                 }
-                
+
                 screenChanged(type, newSource);
 	        });
     	}
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index c6b4fce14e..66661843e6 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -30,6 +30,7 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool gotoPreviousApp: false
+    property bool gotoPreviousAppFromScript: false
 
     property var tablet;
   
@@ -42,7 +43,9 @@ Item {
         }
 
         if (HMD.active) {
-            if (gotoPreviousApp) {
+            if (gotoPreviousAppFromScript) {
+                dialog.parent.sendToScript("returnToPreviousApp");
+            } else if (gotoPreviousApp) {
                 tablet.returnToPreviousApp();
             } else {
                 tablet.popFromStack();
@@ -59,7 +62,9 @@ Item {
         }
 
         if (HMD.active) {
-            if (gotoPreviousApp) {
+            if (gotoPreviousAppFromScript) {
+                dialog.parent.sendToScript("returnToPreviousApp");
+            } else if (gotoPreviousApp) {
                 tablet.returnToPreviousApp();
             } else {
                 tablet.popFromStack();
@@ -72,7 +77,9 @@ Item {
     function closeDialog() {
         var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
-        if (gotoPreviousApp) {
+        if (gotoPreviousAppFromScript) {
+            dialog.parent.sendToScript("returnToPreviousApp");
+        } else if (gotoPreviousApp) {
             tablet.returnToPreviousApp();
         } else {
             tablet.gotoHomeScreen();
diff --git a/interface/src/AppNapDisabler.h b/interface/src/AppNapDisabler.h
new file mode 100644
index 0000000000..b3cfc3038d
--- /dev/null
+++ b/interface/src/AppNapDisabler.h
@@ -0,0 +1,24 @@
+//
+//  AppNapDisabler.h
+//  interface/src
+//
+//  Copyright 2019 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_AppNapDisabler_h
+#define hifi_AppNapDisabler_h
+
+#import <objc/objc-runtime.h>
+
+class AppNapDisabler {
+public:
+    AppNapDisabler();
+    ~AppNapDisabler();
+private:
+    id _activity;
+};
+
+#endif // hifi_AppNapDisabler_h
diff --git a/interface/src/AppNapDisabler.mm b/interface/src/AppNapDisabler.mm
new file mode 100644
index 0000000000..0c760fad5f
--- /dev/null
+++ b/interface/src/AppNapDisabler.mm
@@ -0,0 +1,28 @@
+//
+//  AppNapDisabler.mm
+//  interface/src
+//
+//  Copyright 2019 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 <QtGlobal>
+#ifdef Q_OS_MAC
+
+#include "AppNapDisabler.h"
+
+#import <AppKit/AppKit.h>
+
+AppNapDisabler::AppNapDisabler() {
+    _activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityUserInitiated reason:@"Audio is in use"];
+    [_activity retain];
+}
+
+AppNapDisabler::~AppNapDisabler() {
+    [[NSProcessInfo processInfo] endActivity:_activity];
+    [_activity release];
+}
+
+#endif // Q_OS_MAC
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 91f7528f93..b4a37519a6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -58,7 +58,9 @@
 
 #include <shared/FileUtils.h>
 #include <shared/QtHelpers.h>
+#include <shared/PlatformHelper.h>
 #include <shared/GlobalAppProperties.h>
+#include <GeometryUtil.h>
 #include <StatTracker.h>
 #include <Trace.h>
 #include <ResourceScriptingInterface.h>
@@ -73,6 +75,7 @@
 #include <Midi.h>
 #include <AudioInjectorManager.h>
 #include <AvatarBookmarks.h>
+#include <CrashHelpers.h>
 #include <CursorManager.h>
 #include <VirtualPadManager.h>
 #include <DebugDraw.h>
@@ -103,8 +106,8 @@
 #include <MessagesClient.h>
 #include <hfm/ModelFormatRegistry.h>
 #include <model-networking/ModelCacheScriptingInterface.h>
+#include <material-networking/MaterialCacheScriptingInterface.h>
 #include <material-networking/TextureCacheScriptingInterface.h>
-#include <material-networking/MaterialCache.h>
 #include <ModelEntityItem.h>
 #include <NetworkAccessManager.h>
 #include <NetworkingConstants.h>
@@ -137,6 +140,7 @@
 #include <SoundCacheScriptingInterface.h>
 #include <ui/TabletScriptingInterface.h>
 #include <ui/ToolbarScriptingInterface.h>
+#include <ui/types/ContextAwareProfile.h>
 #include <Tooltip.h>
 #include <udt/PacketHeaders.h>
 #include <UserActivityLogger.h>
@@ -151,7 +155,6 @@
 #include <display-plugins/CompositorHelper.h>
 #include <display-plugins/hmd/HmdDisplayPlugin.h>
 #include <display-plugins/RefreshRateController.h>
-#include <trackers/EyeTracker.h>
 #include <avatars-renderer/ScriptAvatar.h>
 #include <RenderableEntityItem.h>
 #include <RenderableTextEntityItem.h>
@@ -257,15 +260,17 @@ extern "C" {
 }
 #endif
 
-#ifdef Q_OS_MAC
-#include "MacHelper.h"
-#endif
-
 #if defined(Q_OS_ANDROID)
 #include <android/log.h>
 #include "AndroidHelper.h"
 #endif
 
+#if defined(Q_OS_MAC)
+// On Mac OS, disable App Nap to prevent audio glitches while running in the background
+#include "AppNapDisabler.h"
+static AppNapDisabler appNapDisabler;   // disabled, while in scope
+#endif
+
 #include "graphics/RenderEventHandler.h"
 
 Q_LOGGING_CATEGORY(trace_app_input_mouse, "trace.app.input.mouse")
@@ -552,13 +557,6 @@ public:
                 return true;
             }
 
-            if (message->message == WM_POWERBROADCAST) {
-                if (message->wParam == PBT_APMRESUMEAUTOMATIC) {
-                    qCInfo(interfaceapp) << "Waking up from sleep or hybernation.";
-                    QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
-                }
-            }
-
             if (message->message == WM_COPYDATA) {
                 COPYDATASTRUCT* pcds = (COPYDATASTRUCT*)(message->lParam);
                 QUrl url = QUrl((const char*)(pcds->lpData));
@@ -717,6 +715,8 @@ static const QString STATE_CAMERA_FIRST_PERSON = "CameraFirstPerson";
 static const QString STATE_CAMERA_THIRD_PERSON = "CameraThirdPerson";
 static const QString STATE_CAMERA_ENTITY = "CameraEntity";
 static const QString STATE_CAMERA_INDEPENDENT = "CameraIndependent";
+static const QString STATE_CAMERA_LOOK_AT = "CameraLookAt";
+static const QString STATE_CAMERA_SELFIE = "CameraSelfie";
 static const QString STATE_SNAP_TURN = "SnapTurn";
 static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement";
 static const QString STATE_GROUNDED = "Grounded";
@@ -818,6 +818,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     }
 
     // Tell the plugin manager about our statically linked plugins
+    DependencyManager::set<ScriptInitializers>();
     DependencyManager::set<PluginManager>();
     auto pluginManager = PluginManager::getInstance();
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
@@ -861,13 +862,12 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<VirtualPad::Manager>();
     DependencyManager::set<DesktopPreviewProvider>();
 #if defined(Q_OS_ANDROID)
-    DependencyManager::set<AccountManager>(); // use the default user agent getter
+    DependencyManager::set<AccountManager>(true); // use the default user agent getter
 #else
-    DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
+    DependencyManager::set<AccountManager>(true, std::bind(&Application::getUserAgent, qApp));
 #endif
     DependencyManager::set<StatTracker>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT, defaultScriptsOverrideOption);
-    DependencyManager::set<ScriptInitializerMixin, NativeScriptInitializers>();
     DependencyManager::set<Preferences>();
     DependencyManager::set<recording::Deck>();
     DependencyManager::set<recording::Recorder>();
@@ -886,13 +886,13 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<DdeFaceTracker>();
 #endif
     
-    DependencyManager::set<EyeTracker>();
     DependencyManager::set<AudioClient>();
     DependencyManager::set<AudioScope>();
     DependencyManager::set<DeferredLightingEffect>();
     DependencyManager::set<TextureCache>();
     DependencyManager::set<MaterialCache>();
     DependencyManager::set<TextureCacheScriptingInterface>();
+    DependencyManager::set<MaterialCacheScriptingInterface>();
     DependencyManager::set<FramebufferCache>();
     DependencyManager::set<AnimationCache>();
     DependencyManager::set<AnimationCacheScriptingInterface>();
@@ -933,7 +933,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<AudioInjectorManager>();
     DependencyManager::set<MessagesClient>();
     controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR,
-                    STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_THIRD_PERSON, STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT,
+                    STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_THIRD_PERSON, STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE,
                     STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED,
                     STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } });
     DependencyManager::set<UserInputMapper>();
@@ -964,9 +964,12 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<KeyboardScriptingInterface>();
     DependencyManager::set<GrabManager>();
     DependencyManager::set<AvatarPackager>();
-#ifdef Q_OS_MAC
-    DependencyManager::set<MacHelper>();
-#endif
+    PlatformHelper::setup();
+    
+    QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
+        QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
+    });
+
 
     QString setBookmarkValue = getCmdOption(argc, constArgv, "--setBookmark");
     if (!setBookmarkValue.isEmpty()) {
@@ -1066,6 +1069,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
     setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
 
+    LogHandler::getInstance().moveToThread(thread());
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+
     {
         const QStringList args = arguments();
 
@@ -1149,7 +1155,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf");
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf");
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf");
-    _window->setWindowTitle("High Fidelity Interface");
+    _window->setWindowTitle("High Fidelity");
 
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
 
@@ -1172,6 +1178,17 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         deadlockWatchdogThread->setMainThreadID(QThread::currentThreadId());
         deadlockWatchdogThread->start();
 
+        // Pause the deadlock watchdog when we sleep, or it might 
+        // trigger a false positive when we wake back up
+        auto platformHelper = PlatformHelper::instance();
+
+        connect(platformHelper, &PlatformHelper::systemWillSleep, [] {
+            DeadlockWatchdogThread::pause();
+        });
+
+        connect(platformHelper, &PlatformHelper::systemWillWake, [] {
+            DeadlockWatchdogThread::resume();
+        });
 
         // Main thread timer to keep the watchdog updated
         QTimer* watchdogUpdateTimer = new QTimer(this);
@@ -1866,6 +1883,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float {
         return qApp->getCamera().getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0;
     });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_LOOK_AT, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_SELFIE, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_SELFIE ? 1 : 0;
+    });
     _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float {
         return qApp->getCamera().getMode() == CAMERA_MODE_ENTITY ? 1 : 0;
     });
@@ -1991,12 +2014,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(ddeTracker.data(), &FaceTracker::muteToggled, this, &Application::faceTrackerMuteToggled);
 #endif
 
-#ifdef HAVE_IVIEWHMD
-    auto eyeTracker = DependencyManager::get<EyeTracker>();
-    eyeTracker->init();
-    setActiveEyeTracker();
-#endif
-
     // If launched from Steam, let it handle updates
     const QString HIFI_NO_UPDATER_COMMAND_LINE_KEY = "--no-updater";
     bool noUpdater = arguments().indexOf(HIFI_NO_UPDATER_COMMAND_LINE_KEY) != -1;
@@ -2675,6 +2692,8 @@ void Application::updateHeartbeat() const {
 }
 
 void Application::onAboutToQuit() {
+    setCrashAnnotation("shutdown", "1");
+
     // quickly save AvatarEntityData before the EntityTree is dismantled
     getMyAvatar()->saveAvatarEntityDataToSettings();
 
@@ -2713,6 +2732,11 @@ void Application::onAboutToQuit() {
 
     cleanupBeforeQuit();
 
+    if (_crashOnShutdown) {
+        // triggered by crash menu
+        crash::nullDeref();
+    }
+
     getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::SHUTDOWN);
 }
 
@@ -2733,9 +2757,6 @@ void Application::cleanupBeforeQuit() {
     // Stop third party processes so that they're not left running in the event of a subsequent shutdown crash.
 #ifdef HAVE_DDE
     DependencyManager::get<DdeFaceTracker>()->setEnabled(false);
-#endif
-#ifdef HAVE_IVIEWHMD
-    DependencyManager::get<EyeTracker>()->setEnabled(false, true);
 #endif
     AnimDebugDraw::getInstance().shutdown();
 
@@ -2810,9 +2831,6 @@ void Application::cleanupBeforeQuit() {
 #ifdef HAVE_DDE
     DependencyManager::destroy<DdeFaceTracker>();
 #endif
-#ifdef HAVE_IVIEWHMD
-    DependencyManager::destroy<EyeTracker>();
-#endif
 
     DependencyManager::destroy<ContextOverlayInterface>(); // Must be destroyed before TabletScriptingInterface
 
@@ -2821,7 +2839,7 @@ void Application::cleanupBeforeQuit() {
     DependencyManager::destroy<TabletScriptingInterface>();
     DependencyManager::destroy<ToolbarScriptingInterface>();
     DependencyManager::destroy<OffscreenUi>();
-    
+
     DependencyManager::destroy<OffscreenQmlSurfaceCache>();
 
     _snapshotSoundInjector = nullptr;
@@ -2868,9 +2886,7 @@ Application::~Application() {
     _gameWorkload.shutdown();
 
     DependencyManager::destroy<Preferences>();
-#ifdef Q_OS_MAC
-    DependencyManager::destroy<MacHelper>();
-#endif
+    PlatformHelper::shutdown();
 
     _entityClipboard->eraseAllOctreeElements();
     _entityClipboard.reset();
@@ -2897,6 +2913,7 @@ Application::~Application() {
     DependencyManager::destroy<AnimationCacheScriptingInterface>();
     DependencyManager::destroy<AnimationCache>();
     DependencyManager::destroy<FramebufferCache>();
+    DependencyManager::destroy<MaterialCacheScriptingInterface>();
     DependencyManager::destroy<MaterialCache>();
     DependencyManager::destroy<TextureCacheScriptingInterface>();
     DependencyManager::destroy<TextureCache>();
@@ -3140,7 +3157,7 @@ void Application::showLoginScreen() {
         QJsonObject loginData = {};
         loginData["action"] = "login dialog popped up";
         UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-        _window->setWindowTitle("High Fidelity Interface");
+        _window->setWindowTitle("High Fidelity");
     } else {
         resumeAfterLoginDialogActionTaken();
     }
@@ -3275,6 +3292,9 @@ void Application::initializeUi() {
         }
         return result.toPoint();
     });
+
+    // BUGZ-1365 - the root context should explicitly default to being unable to load local HTML content
+    ContextAwareProfile::restrictContext(offscreenUi->getSurfaceContext(), true);
     offscreenUi->resume();
 #endif
     connect(_window, &MainWindow::windowGeometryChanged, [this](const QRect& r){
@@ -3411,7 +3431,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
     surfaceContext->setContextProperty("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
     surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
-    surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
+    surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
     surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
     surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
@@ -3419,6 +3439,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     // Caches
     surfaceContext->setContextProperty("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
     surfaceContext->setContextProperty("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
+    surfaceContext->setContextProperty("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
     surfaceContext->setContextProperty("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
     surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
 
@@ -3527,7 +3548,7 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona
         surfaceContext->setContextProperty("offscreenFlags", flags);
         surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
 
-        surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
         surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
         surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface());
 
@@ -3582,7 +3603,8 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
     // Always use the default eye position, not the actual head eye position.
     // Using the latter will cause the camera to wobble with idle animations,
     // or with changes from the face tracker
-    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
+    CameraMode mode = _myCamera.getMode();
+    if (mode == CAMERA_MODE_FIRST_PERSON) {
         _thirdPersonHMDCameraBoomValid= false;
         if (isHMDMode()) {
             mat4 camMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
@@ -3593,10 +3615,8 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
             _myCamera.setPosition(myAvatar->getDefaultEyePosition());
             _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
         }
-    }
-    else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
+    } else if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
         if (isHMDMode()) {
-
             if (!_thirdPersonHMDCameraBoomValid) {
                 const glm::vec3 CAMERA_OFFSET = glm::vec3(0.0f, 0.0f, 0.7f);
                 _thirdPersonHMDCameraBoom = cancelOutRollAndPitch(myAvatar->getHMDSensorOrientation()) * CAMERA_OFFSET;
@@ -3611,22 +3631,28 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
 
             _myCamera.setOrientation(glm::normalize(glmExtractRotation(worldCameraMat)));
             _myCamera.setPosition(extractTranslation(worldCameraMat));
-        }
-        else {
+        } else {
             _thirdPersonHMDCameraBoomValid = false;
-
-            _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
-            if (isOptionChecked(MenuOption::CenterPlayerInView)) {
+            if (mode == CAMERA_MODE_THIRD_PERSON) {
+                _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
+                if (isOptionChecked(MenuOption::CenterPlayerInView)) {
+                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                        + _myCamera.getOrientation() * boomOffset);
+                } else {
+                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                        + myAvatar->getWorldOrientation() * boomOffset);
+                }
+            } else {
+                glm::quat lookAtRotation = myAvatar->getLookAtRotation();
+                if (mode == CAMERA_MODE_SELFIE) {
+                    lookAtRotation = lookAtRotation * glm::angleAxis(PI, myAvatar->getWorldOrientation() * Vectors::UP);
+                }
                 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                    + _myCamera.getOrientation() * boomOffset);
-            }
-            else {
-                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                    + myAvatar->getWorldOrientation() * boomOffset);
+                    + lookAtRotation * boomOffset);
+                _myCamera.lookAt(myAvatar->getDefaultEyePosition());
             }
         }
-    }
-    else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
+    } else if (mode == CAMERA_MODE_MIRROR) {
         _thirdPersonHMDCameraBoomValid= false;
 
         if (isHMDMode()) {
@@ -3664,8 +3690,7 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
                 glm::vec3(0.0f, 0.0f, -1.0f) * myAvatar->getBoomLength() * _scaleMirror);
         }
         renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
-    }
-    else if (_myCamera.getMode() == CAMERA_MODE_ENTITY) {
+    } else if (mode == CAMERA_MODE_ENTITY) {
         _thirdPersonHMDCameraBoomValid= false;
         EntityItemPointer cameraEntity = _myCamera.getCameraEntityPointer();
         if (cameraEntity != nullptr) {
@@ -4333,14 +4358,14 @@ void Application::keyPressEvent(QKeyEvent* event) {
             _keyboardMouseDevice->keyReleaseEvent(event);
         }
 
-        bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);
+        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
         bool isOption = event->modifiers().testFlag(Qt::AltModifier);
         switch (event->key()) {
             case Qt::Key_4:
             case Qt::Key_5:
             case Qt::Key_6:
             case Qt::Key_7:
-                if (isMeta || isOption) {
+                if (isControlOrCommand || isOption) {
                     unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
                     auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
                     if (index < displayPlugins.size()) {
@@ -4361,7 +4386,8 @@ void Application::keyPressEvent(QKeyEvent* event) {
         }
 
         bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
-        bool isMeta = event->modifiers().testFlag(Qt::ControlModifier);
+        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
+        bool isMetaOrMacControl = event->modifiers().testFlag(Qt::MetaModifier);
         bool isOption = event->modifiers().testFlag(Qt::AltModifier);
         switch (event->key()) {
             case Qt::Key_Enter:
@@ -4382,19 +4408,19 @@ void Application::keyPressEvent(QKeyEvent* event) {
             }
             case Qt::Key_2: {
                 Menu* menu = Menu::getInstance();
-                menu->triggerOption(MenuOption::FullscreenMirror);
+                menu->triggerOption(MenuOption::SelfieCamera);
                 break;
             }
             case Qt::Key_3: {
                 Menu* menu = Menu::getInstance();
-                menu->triggerOption(MenuOption::ThirdPerson);
+                menu->triggerOption(MenuOption::LookAtCamera);
                 break;
             }
             case Qt::Key_4:
             case Qt::Key_5:
             case Qt::Key_6:
             case Qt::Key_7:
-                if (isMeta || isOption) {
+                if (isControlOrCommand || isOption) {
                     unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
                     auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
                     if (index < displayPlugins.size()) {
@@ -4410,7 +4436,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_G:
-                if (isShifted && isMeta && Menu::getInstance() && Menu::getInstance()->getMenu("Developer")->isVisible()) {
+                if (isShifted && isControlOrCommand && isOption && isMetaOrMacControl) {
                     static const QString HIFI_FRAMES_FOLDER_VAR = "HIFI_FRAMES_FOLDER";
                     static const QString GPU_FRAME_FOLDER = QProcessEnvironment::systemEnvironment().contains(HIFI_FRAMES_FOLDER_VAR)
                         ? QProcessEnvironment::systemEnvironment().value(HIFI_FRAMES_FOLDER_VAR)
@@ -4423,7 +4449,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 }
                 break;
             case Qt::Key_X:
-                if (isShifted && isMeta) {
+                if (isShifted && isControlOrCommand) {
                     auto offscreenUi = getOffscreenUI();
                     offscreenUi->togglePinned();
                     //offscreenUi->getSurfaceContext()->engine()->clearComponentCache();
@@ -4433,7 +4459,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_Y:
-                if (isShifted && isMeta) {
+                if (isShifted && isControlOrCommand) {
                     getActiveDisplayPlugin()->cycleDebugOutput();
                 }
                 break;
@@ -4446,16 +4472,16 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_L:
-                if (isShifted && isMeta) {
+                if (isShifted && isControlOrCommand) {
                     Menu::getInstance()->triggerOption(MenuOption::Log);
-                } else if (isMeta) {
+                } else if (isControlOrCommand) {
                     auto dialogsManager = DependencyManager::get<DialogsManager>();
                     dialogsManager->toggleAddressBar();
                 }
                 break;
 
             case Qt::Key_R:
-                if (isMeta && !event->isAutoRepeat()) {
+                if (isControlOrCommand && !event->isAutoRepeat()) {
                     DependencyManager::get<ScriptEngines>()->reloadAllScripts();
                     getOffscreenUI()->clearCache();
                 }
@@ -4466,7 +4492,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_M:
-                if (isMeta) {
+                if (isControlOrCommand) {
                     auto audioClient = DependencyManager::get<AudioClient>();
                     audioClient->setMuted(!audioClient->isMuted());
                     QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
@@ -4477,13 +4503,13 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_S:
-                if (isShifted && isMeta && !isOption) {
+                if (isShifted && isControlOrCommand && !isOption) {
                     Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings);
                 }
                 break;
 
             case Qt::Key_Apostrophe: {
-                if (isMeta) {
+                if (isControlOrCommand) {
                     auto cursor = Cursor::Manager::instance().getCursor();
                     auto curIcon = cursor->getIcon();
                     if (curIcon == Cursor::Icon::DEFAULT) {
@@ -4510,7 +4536,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_Plus: {
-                if (isMeta && event->modifiers().testFlag(Qt::KeypadModifier)) {
+                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
                     auto& cursorManager = Cursor::Manager::instance();
                     cursorManager.setScale(cursorManager.getScale() * 1.1f);
                 } else {
@@ -4520,7 +4546,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
             }
 
             case Qt::Key_Minus: {
-                if (isMeta && event->modifiers().testFlag(Qt::KeypadModifier)) {
+                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
                     auto& cursorManager = Cursor::Manager::instance();
                     cursorManager.setScale(cursorManager.getScale() / 1.1f);
                 } else {
@@ -5314,35 +5340,6 @@ void Application::setActiveFaceTracker() const {
 #endif
 }
 
-#ifdef HAVE_IVIEWHMD
-void Application::setActiveEyeTracker() {
-    auto eyeTracker = DependencyManager::get<EyeTracker>();
-    if (!eyeTracker->isInitialized()) {
-        return;
-    }
-
-    bool isEyeTracking = Menu::getInstance()->isOptionChecked(MenuOption::SMIEyeTracking);
-    bool isSimulating = Menu::getInstance()->isOptionChecked(MenuOption::SimulateEyeTracking);
-    eyeTracker->setEnabled(isEyeTracking, isSimulating);
-
-    Menu::getInstance()->getActionForOption(MenuOption::OnePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
-    Menu::getInstance()->getActionForOption(MenuOption::ThreePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
-    Menu::getInstance()->getActionForOption(MenuOption::FivePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
-}
-
-void Application::calibrateEyeTracker1Point() {
-    DependencyManager::get<EyeTracker>()->calibrate(1);
-}
-
-void Application::calibrateEyeTracker3Points() {
-    DependencyManager::get<EyeTracker>()->calibrate(3);
-}
-
-void Application::calibrateEyeTracker5Points() {
-    DependencyManager::get<EyeTracker>()->calibrate(5);
-}
-#endif
-
 bool Application::exportEntities(const QString& filename,
                                  const QVector<QUuid>& entityIDs,
                                  const glm::vec3* givenOffset) {
@@ -5508,7 +5505,7 @@ void Application::loadSettings() {
     // dictated that we should be in first person
     Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, isFirstPerson);
     Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !isFirstPerson);
-    _myCamera.setMode((isFirstPerson) ? CAMERA_MODE_FIRST_PERSON : CAMERA_MODE_THIRD_PERSON);
+    _myCamera.setMode((isFirstPerson) ? CAMERA_MODE_FIRST_PERSON : CAMERA_MODE_LOOK_AT);
     cameraMenuChanged();
 
     auto inputs = pluginManager->getInputPlugins();
@@ -5816,8 +5813,8 @@ void Application::pushPostUpdateLambda(void* key, const std::function<void()>& f
     _postUpdateLambdas[key] = func;
 }
 
-// Called during Application::update immediately before AvatarManager::updateMyAvatar, updating my data that is then sent to everyone.
-// (Maybe this code should be moved there?)
+// Called during Application::update immediately before AvatarManager::updateMyAvatar, updating my data that is then sent
+// to everyone.
 // The principal result is to call updateLookAtTargetAvatar() and then setLookAtPosition().
 // Note that it is called BEFORE we update position or joints based on sensors, etc.
 void Application::updateMyAvatarLookAtPosition() {
@@ -5826,91 +5823,8 @@ void Application::updateMyAvatarLookAtPosition() {
     PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()");
 
     auto myAvatar = getMyAvatar();
-    myAvatar->updateLookAtTargetAvatar();
     FaceTracker* faceTracker = getActiveFaceTracker();
-    auto eyeTracker = DependencyManager::get<EyeTracker>();
-
-    bool isLookingAtSomeone = false;
-    bool isHMD = qApp->isHMDMode();
-    glm::vec3 lookAtSpot;
-    if (eyeTracker->isTracking() && (isHMD || eyeTracker->isSimulating())) {
-        //  Look at the point that the user is looking at.
-        glm::vec3 lookAtPosition = eyeTracker->getLookAtPosition();
-        if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
-            lookAtPosition.x = -lookAtPosition.x;
-        }
-        if (isHMD) {
-            // TODO -- this code is probably wrong, getHeadPose() returns something in sensor frame, not avatar
-            glm::mat4 headPose = getActiveDisplayPlugin()->getHeadPose();
-            glm::quat hmdRotation = glm::quat_cast(headPose);
-            lookAtSpot = _myCamera.getPosition() + myAvatar->getWorldOrientation() * (hmdRotation * lookAtPosition);
-        } else {
-            lookAtSpot = myAvatar->getHead()->getEyePosition()
-                + (myAvatar->getHead()->getFinalOrientationInWorldFrame() * lookAtPosition);
-        }
-    } else {
-        AvatarSharedPointer lookingAt = myAvatar->getLookAtTargetAvatar().lock();
-        bool haveLookAtCandidate = lookingAt && myAvatar.get() != lookingAt.get();
-        auto avatar = static_pointer_cast<Avatar>(lookingAt);
-        bool mutualLookAtSnappingEnabled = avatar && avatar->getLookAtSnappingEnabled() && myAvatar->getLookAtSnappingEnabled();
-        if (haveLookAtCandidate && mutualLookAtSnappingEnabled) {
-            //  If I am looking at someone else, look directly at one of their eyes
-            isLookingAtSomeone = true;
-            auto lookingAtHead = avatar->getHead();
-
-            const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE;
-            glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FORWARD;
-            glm::vec3 fromLookingAtToMe = glm::normalize(myAvatar->getHead()->getEyePosition()
-                - lookingAtHead->getEyePosition());
-            float faceAngle = glm::angle(lookingAtFaceOrientation, fromLookingAtToMe);
-
-            if (faceAngle < MAXIMUM_FACE_ANGLE) {
-                // Randomly look back and forth between look targets
-                eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ?
-                    LEFT_EYE : myAvatar->getEyeContactTarget();
-                switch (target) {
-                    case LEFT_EYE:
-                        lookAtSpot = lookingAtHead->getLeftEyePosition();
-                        break;
-                    case RIGHT_EYE:
-                        lookAtSpot = lookingAtHead->getRightEyePosition();
-                        break;
-                    case MOUTH:
-                        lookAtSpot = lookingAtHead->getMouthPosition();
-                        break;
-                }
-            } else {
-                // Just look at their head (mid point between eyes)
-                lookAtSpot = lookingAtHead->getEyePosition();
-            }
-        } else {
-            //  I am not looking at anyone else, so just look forward
-            auto headPose = myAvatar->getControllerPoseInWorldFrame(controller::Action::HEAD);
-            if (headPose.isValid()) {
-                lookAtSpot = transformPoint(headPose.getMatrix(), glm::vec3(0.0f, 0.0f, TREE_SCALE));
-            } else {
-                lookAtSpot = myAvatar->getHead()->getEyePosition() +
-                    (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));
-            }
-        }
-
-        // Deflect the eyes a bit to match the detected gaze from the face tracker if active.
-        if (faceTracker && !faceTracker->isMuted()) {
-            float eyePitch = faceTracker->getEstimatedEyePitch();
-            float eyeYaw = faceTracker->getEstimatedEyeYaw();
-            const float GAZE_DEFLECTION_REDUCTION_DURING_EYE_CONTACT = 0.1f;
-            glm::vec3 origin = myAvatar->getHead()->getEyePosition();
-            float deflection = faceTracker->getEyeDeflection();
-            if (isLookingAtSomeone) {
-                deflection *= GAZE_DEFLECTION_REDUCTION_DURING_EYE_CONTACT;
-            }
-            lookAtSpot = origin + _myCamera.getOrientation() * glm::quat(glm::radians(glm::vec3(
-                eyePitch * deflection, eyeYaw * deflection, 0.0f))) *
-                glm::inverse(_myCamera.getOrientation()) * (lookAtSpot - origin);
-        }
-    }
-
-    myAvatar->getHead()->setLookAtPosition(lookAtSpot);
+    myAvatar->updateLookAtPosition(faceTracker, _myCamera);
 }
 
 void Application::updateThreads(float deltaTime) {
@@ -5949,11 +5863,16 @@ void Application::cycleCamera() {
     } else if (menu->isOptionChecked(MenuOption::FirstPerson)) {
 
         menu->setIsOptionChecked(MenuOption::FirstPerson, false);
-        menu->setIsOptionChecked(MenuOption::ThirdPerson, true);
+        menu->setIsOptionChecked(MenuOption::LookAtCamera, true);
 
-    } else if (menu->isOptionChecked(MenuOption::ThirdPerson)) {
+    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
 
-        menu->setIsOptionChecked(MenuOption::ThirdPerson, false);
+        menu->setIsOptionChecked(MenuOption::LookAtCamera, false);
+        menu->setIsOptionChecked(MenuOption::SelfieCamera, true);
+
+    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
+
+        menu->setIsOptionChecked(MenuOption::SelfieCamera, false);
         menu->setIsOptionChecked(MenuOption::FullscreenMirror, true);
 
     }
@@ -5965,11 +5884,11 @@ void Application::cameraModeChanged() {
         case CAMERA_MODE_FIRST_PERSON:
             Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, true);
             break;
-        case CAMERA_MODE_THIRD_PERSON:
-            Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true);
+        case CAMERA_MODE_LOOK_AT:
+            Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
             break;
-        case CAMERA_MODE_MIRROR:
-            Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, true);
+        case CAMERA_MODE_SELFIE:
+            Menu::getInstance()->setIsOptionChecked(MenuOption::SelfieCamera, true);
             break;
         default:
             // we don't have menu items for the others, so just leave it alone.
@@ -5985,32 +5904,32 @@ void Application::changeViewAsNeeded(float boomLength) {
 
     if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON && boomLengthGreaterThanMinimum) {
         Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, false);
-        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
         cameraMenuChanged();
-    } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON && !boomLengthGreaterThanMinimum) {
+    } else if (_myCamera.getMode() == CAMERA_MODE_LOOK_AT && !boomLengthGreaterThanMinimum) {
         Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, true);
-        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, false);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, false);
         cameraMenuChanged();
     }
 }
 
 void Application::cameraMenuChanged() {
     auto menu = Menu::getInstance();
-    if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {
-        if (!isHMDMode() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
-            _mirrorYawOffset = 0.0f;
-            _myCamera.setMode(CAMERA_MODE_MIRROR);
-            getMyAvatar()->reset(false, false, false); // to reset any active MyAvatar::FollowHelpers
-            getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
-        }
-    } else if (menu->isOptionChecked(MenuOption::FirstPerson)) {
+    if (menu->isOptionChecked(MenuOption::FirstPerson)) {
         if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {
             _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
             getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);
         }
-    } else if (menu->isOptionChecked(MenuOption::ThirdPerson)) {
-        if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) {
-            _myCamera.setMode(CAMERA_MODE_THIRD_PERSON);
+    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
+        if (_myCamera.getMode() != CAMERA_MODE_LOOK_AT) {
+            _myCamera.setMode(CAMERA_MODE_LOOK_AT);
+            if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
+                getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
+            }
+        }
+    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
+        if (_myCamera.getMode() != CAMERA_MODE_SELFIE) {
+            _myCamera.setMode(CAMERA_MODE_SELFIE);
             if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
                 getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
             }
@@ -6482,7 +6401,10 @@ void Application::update(float deltaTime) {
             controller::Action::LEFT_UP_LEG,
             controller::Action::RIGHT_UP_LEG,
             controller::Action::LEFT_TOE_BASE,
-            controller::Action::RIGHT_TOE_BASE
+            controller::Action::RIGHT_TOE_BASE,
+            controller::Action::LEFT_EYE,
+            controller::Action::RIGHT_EYE
+
         };
 
         // copy controller poses from userInputMapper to myAvatar.
@@ -7157,8 +7079,7 @@ void Application::resetSensors(bool andReload) {
 #ifdef HAVE_DDE
     DependencyManager::get<DdeFaceTracker>()->reset();
 #endif
-    
-    DependencyManager::get<EyeTracker>()->reset();
+
     _overlayConductor.centerUI();
     getActiveDisplayPlugin()->resetSensors();
     getMyAvatar()->reset(true, andReload);
@@ -7447,7 +7368,7 @@ void Application::addingEntityWithCertificate(const QString& certificateID, cons
     ledger->updateLocation(certificateID, placeName);
 }
 
-void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) {
+void Application::registerScriptEngineWithApplicationServices(const ScriptEnginePointer& scriptEngine) {
 
     scriptEngine->setEmitScriptUpdatesFunction([this]() {
         SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
@@ -7486,9 +7407,19 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     qScriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue,
                             RayToOverlayIntersectionResultFromScriptValue);
 
+    bool clientScript = scriptEngine->isClientScript();
+
 #if !defined(DISABLE_QML)
     scriptEngine->registerGlobalObject("OffscreenFlags", getOffscreenUI()->getFlags());
-    scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
+    if (clientScript) {
+        scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
+    } else {
+        auto desktopScriptingInterface = new DesktopScriptingInterface(nullptr, true);
+        scriptEngine->registerGlobalObject("Desktop", desktopScriptingInterface);
+        if (QThread::currentThread() != thread()) {
+            desktopScriptingInterface->moveToThread(thread());
+        }
+    }
 #endif
 
     qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>);
@@ -7513,7 +7444,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
                                        LocationScriptingInterface::locationSetter);
 
-    bool clientScript = scriptEngine->isClientScript();
     scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
 #if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
     scriptEngine->registerFunction("OverlayWebWindow", clientScript ? QmlWebWindowClass::constructor : QmlWebWindowClass::restricted_constructor);
@@ -7540,6 +7470,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     // Caches
     scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
     scriptEngine->registerGlobalObject("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
     scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
     scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
 
@@ -8573,6 +8504,8 @@ void Application::toggleLogDialog() {
             Qt::WindowFlags flags = _logDialog->windowFlags() | Qt::Tool;
             _logDialog->setWindowFlags(flags);
         }
+#else
+        Q_UNUSED(keepOnTop)
 #endif
     }
 
@@ -9089,9 +9022,9 @@ void Application::setDisplayPlugin(DisplayPluginPointer newDisplayPlugin) {
             cameraMenuChanged();
         }
 
-        // Remove the mirror camera option from menu if in HMD mode
-        auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror);
-        mirrorAction->setVisible(!isHmd);
+        // Remove the selfie camera options from menu if in HMD mode
+        auto selfieAction = menu->getActionForOption(MenuOption::SelfieCamera);
+        selfieAction->setVisible(!isHmd);
     }
 
     Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
@@ -9525,6 +9458,14 @@ void Application::showUrlHandler(const QUrl& url) {
         }
     });
 }
+
+// used to test "shutdown" crash annotation.
+void Application::crashOnShutdown() {
+    qDebug() << "crashOnShutdown(), ON PURPOSE!";
+    _crashOnShutdown = true;
+    quit();
+}
+
 void Application::overrideEntry(){
     _overrideEntry = true;
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 913671473d..af2348d1e9 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -252,7 +252,7 @@ public:
     NodeToOctreeSceneStats* getOcteeSceneStats() { return &_octreeServerSceneStats; }
 
     virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
-    virtual void registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) override;
+    virtual void registerScriptEngineWithApplicationServices(const ScriptEnginePointer& scriptEngine) override;
 
     virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const override { copyDisplayViewFrustum(viewOut); }
     virtual QThread* getMainThread() override { return thread(); }
@@ -437,13 +437,6 @@ public slots:
     void sendWrongProtocolVersionsSignature(bool checked) { ::sendWrongProtocolVersionsSignature(checked); }
 #endif
 
-#ifdef HAVE_IVIEWHMD
-    void setActiveEyeTracker();
-    void calibrateEyeTracker1Point();
-    void calibrateEyeTracker3Points();
-    void calibrateEyeTracker5Points();
-#endif
-
     static void showHelp();
 
     void cycleCamera();
@@ -497,6 +490,9 @@ public slots:
     bool gpuTextureMemSizeStable();
     void showUrlHandler(const QUrl& url);
 
+    // used to test "shutdown" crash annotation.
+    void crashOnShutdown();
+
 private slots:
     void onDesktopRootItemCreated(QQuickItem* qmlContext);
     void onDesktopRootContextCreated(QQmlContext* qmlContext);
@@ -844,5 +840,7 @@ private:
     bool _overrideEntry { false };
 
     VisionSqueeze _visionSqueeze;
+
+    bool _crashOnShutdown { false };
 };
 #endif // hifi_Application_h
diff --git a/interface/src/MacHelper.cpp b/interface/src/MacHelper.cpp
deleted file mode 100755
index 8527f02918..0000000000
--- a/interface/src/MacHelper.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  MacHelper.h
-//  interface/src
-//
-//  Created by Howard Stearns
-//  Copyright 2019 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 "InterfaceLogging.h"
-#include "MacHelper.h"
-#include <NodeList.h>
-
-#ifdef Q_OS_MAC
-#include <IOKit/IOMessage.h>
-#include <IOKit/pwr_mgt/IOPMLib.h>
-
-// The type definitions in these variables come from IOKit, which includes a definition of Duration that conflicts with ours.
-// So... we include these definitions here rather than in the .h, as the .h is included in Application.cpp which
-// uses Duration.
-static io_connect_t  root_port;
-static IONotificationPortRef notifyPortRef;
-static io_object_t notifierObject;
-static void* refCon;
-
-static void sleepHandler(void* refCon, io_service_t service, natural_t messageType, void* messageArgument) {
-    if (messageType == kIOMessageSystemHasPoweredOn) {
-        qCInfo(interfaceapp) << "Waking up from sleep or hybernation.";
-        QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
-    }
-}
-#endif
-
-MacHelper::MacHelper() {
-#ifdef Q_OS_MAC
-     root_port = IORegisterForSystemPower(refCon, &notifyPortRef, sleepHandler, &notifierObject);
-     if (root_port == 0) {
-         qCWarning(interfaceapp) << "IORegisterForSystemPower failed";
-         return;
-     }
-     CFRunLoopAddSource(CFRunLoopGetCurrent(),
-                        IONotificationPortGetRunLoopSource(notifyPortRef),
-                        kCFRunLoopCommonModes);
-#endif
-}
-
-MacHelper::~MacHelper() {
-#ifdef Q_OS_MAC
-     CFRunLoopRemoveSource(CFRunLoopGetCurrent(),
-                           IONotificationPortGetRunLoopSource(notifyPortRef),
-                           kCFRunLoopCommonModes);
-     IODeregisterForSystemPower(&notifierObject);
-     IOServiceClose(root_port);
-     IONotificationPortDestroy(notifyPortRef);
-#endif
-}
diff --git a/interface/src/MacHelper.h b/interface/src/MacHelper.h
deleted file mode 100755
index 52ad4d3e55..0000000000
--- a/interface/src/MacHelper.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  MacHelper.h
-//  interface/src
-//
-//  Created by Howard Stearns
-//  Copyright 2019 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
-//
-
-#pragma once
-
-#include "DependencyManager.h"
-
-class MacHelper : public Dependency {
-public:
-    MacHelper();
-    ~MacHelper();
-};
-
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 4cf78c23ee..89fec3c812 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -177,19 +177,19 @@ Menu::Menu() {
 
     firstPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
 
-    // View > Third Person
-    auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
-                                   viewMenu, MenuOption::ThirdPerson, 0,
+    // View > Look At
+    auto lookAtAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
+                                   viewMenu, MenuOption::LookAtCamera, 0,
                                    false, qApp, SLOT(cameraMenuChanged())));
 
-    thirdPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
+    lookAtAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
 
-    // View > Mirror
-    auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
-                                   viewMenu, MenuOption::FullscreenMirror, 0,
-                                   false, qApp, SLOT(cameraMenuChanged())));
+    // View > Selfie
+    auto selfieAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
+        viewMenu, MenuOption::SelfieCamera, 0,
+        false, qApp, SLOT(cameraMenuChanged())));
 
-    viewMirrorAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
+    selfieAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
 
     viewMenu->addSeparator();
 
@@ -534,32 +534,18 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);
 #endif
 
-#ifdef HAVE_IVIEWHMD
-    // Developer > Avatar > Eye Tracking
-    MenuWrapper* eyeTrackingMenu = avatarDebugMenu->addMenu("Eye Tracking");
-    addCheckableActionToQMenuAndActionHash(eyeTrackingMenu, MenuOption::SMIEyeTracking, 0, false,
-        qApp, SLOT(setActiveEyeTracker()));
-    {
-        MenuWrapper* calibrateEyeTrackingMenu = eyeTrackingMenu->addMenu("Calibrate");
-        addActionToQMenuAndActionHash(calibrateEyeTrackingMenu, MenuOption::OnePointCalibration, 0,
-            qApp, SLOT(calibrateEyeTracker1Point()));
-        addActionToQMenuAndActionHash(calibrateEyeTrackingMenu, MenuOption::ThreePointCalibration, 0,
-            qApp, SLOT(calibrateEyeTracker3Points()));
-        addActionToQMenuAndActionHash(calibrateEyeTrackingMenu, MenuOption::FivePointCalibration, 0,
-            qApp, SLOT(calibrateEyeTracker5Points()));
-    }
-    addCheckableActionToQMenuAndActionHash(eyeTrackingMenu, MenuOption::SimulateEyeTracking, 0, false,
-        qApp, SLOT(setActiveEyeTracker()));
-#endif
-
     action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AvatarReceiveStats, 0, false);
     connect(action, &QAction::triggered, [this]{ Avatar::setShowReceiveStats(isOptionChecked(MenuOption::AvatarReceiveStats)); });
     action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowBoundingCollisionShapes, 0, false);
     connect(action, &QAction::triggered, [this]{ Avatar::setShowCollisionShapes(isOptionChecked(MenuOption::ShowBoundingCollisionShapes)); });
     action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowMyLookAtVectors, 0, false);
     connect(action, &QAction::triggered, [this]{ Avatar::setShowMyLookAtVectors(isOptionChecked(MenuOption::ShowMyLookAtVectors)); });
+    action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowMyLookAtTarget, 0, false);
+    connect(action, &QAction::triggered, [this]{ Avatar::setShowMyLookAtTarget(isOptionChecked(MenuOption::ShowMyLookAtTarget)); });
     action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowOtherLookAtVectors, 0, false);
     connect(action, &QAction::triggered, [this]{ Avatar::setShowOtherLookAtVectors(isOptionChecked(MenuOption::ShowOtherLookAtVectors)); });
+    action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowOtherLookAtTarget, 0, false);
+    connect(action, &QAction::triggered, [this]{ Avatar::setShowOtherLookAtTarget(isOptionChecked(MenuOption::ShowOtherLookAtTarget)); });
 
     auto avatarManager = DependencyManager::get<AvatarManager>();
     auto avatar = avatarManager->getMyAvatar();
@@ -725,43 +711,51 @@ Menu::Menu() {
         DependencyManager::get<PickManager>().data(), SLOT(setForceCoarsePicking(bool)));
 
     // Developer > Crash >>>
-    MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
+    bool result = false;
+    const QString HIFI_SHOW_DEVELOPER_CRASH_MENU("HIFI_SHOW_DEVELOPER_CRASH_MENU");
+    result = QProcessEnvironment::systemEnvironment().contains(HIFI_SHOW_DEVELOPER_CRASH_MENU);
+    if (result) {
+        MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
     
-    // Developer > Crash > Display Crash Options
-    addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);
+        // Developer > Crash > Display Crash Options
+        addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);
 
-    addActionToQMenuAndActionHash(crashMenu, MenuOption::DeadlockInterface, 0, qApp, SLOT(deadlockApplication()));
-    addActionToQMenuAndActionHash(crashMenu, MenuOption::UnresponsiveInterface, 0, qApp, SLOT(unresponsiveApplication()));
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::DeadlockInterface, 0, qApp, SLOT(deadlockApplication()));
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::UnresponsiveInterface, 0, qApp, SLOT(unresponsiveApplication()));
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
-    connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::pureVirtualCall).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
+        connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::pureVirtualCall).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);
-    connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doubleFree).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);
+        connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doubleFree).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);
-    connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doAbort).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);
+        connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doAbort).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);
-    connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::nullDeref).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);
+        connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::nullDeref).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);
-    connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::outOfBoundsVectorCrash).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);
+        connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::outOfBoundsVectorCrash).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);
-    connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);
+        connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
+
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOnShutdown, 0, qApp, SLOT(crashOnShutdown()));
+    }
+    
 
     // Developer > Show Statistics
     addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 70687786a9..0ba1159052 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -72,6 +72,7 @@ namespace MenuOption {
     const QString CrashNullDereferenceThreaded = "Null Dereference (threaded)";
     const QString CrashAbort = "Abort";
     const QString CrashAbortThreaded = "Abort (threaded)";
+    const QString CrashOnShutdown = "Crash During Shutdown";
     const QString CrashOutOfBoundsVectorAccess = "Out of Bounds Vector Access";
     const QString CrashOutOfBoundsVectorAccessThreaded = "Out of Bounds Vector Access (threaded)";
     const QString CrashNewFault = "New Fault";
@@ -128,6 +129,7 @@ namespace MenuOption {
     const QString Login = "Login/Sign Up";
     const QString Log = "Log";
     const QString LogExtraTimings = "Log Extra Timing Details";
+    const QString LookAtCamera = "Third Person";
     const QString LowVelocityFilter = "Low Velocity Filter";
     const QString MeshVisible = "Draw Mesh";
     const QString MuteEnvironment = "Mute Environment";
@@ -180,6 +182,7 @@ namespace MenuOption {
     const QString RunTimingTests = "Run Timing Tests";
     const QString ScriptedMotorControl = "Enable Scripted Motor Control";
     const QString ShowTrackedObjects = "Show Tracked Objects";
+    const QString SelfieCamera = "Selfie";
     const QString SendWrongDSConnectVersion = "Send wrong DS connect version";
     const QString SendWrongProtocolVersion = "Send wrong protocol version";
     const QString SetHomeLocation = "Set Home Location";
@@ -187,7 +190,9 @@ namespace MenuOption {
     const QString ShowBoundingCollisionShapes = "Show Bounding Collision Shapes";
     const QString ShowDSConnectTable = "Show Domain Connection Timing";
     const QString ShowMyLookAtVectors = "Show My Eye Vectors";
+    const QString ShowMyLookAtTarget = "Show My Look-At Target";
     const QString ShowOtherLookAtVectors = "Show Other Eye Vectors";
+    const QString ShowOtherLookAtTarget = "Show Other Look-At Target";
     const QString EnableLookAtSnapping = "Enable LookAt Snapping";
     const QString ShowRealtimeEntityStats = "Show Realtime Entity Stats";
     const QString SimulateEyeTracking = "Simulate";
@@ -198,7 +203,7 @@ namespace MenuOption {
     const QString AnimStats = "Show Animation Stats";
     const QString StopAllScripts = "Stop All Scripts";
     const QString SuppressShortTimings = "Suppress Timings Less than 10ms";
-    const QString ThirdPerson = "Third Person";
+    const QString ThirdPerson = "Third Person Legacy";
     const QString ThreePointCalibration = "3 Point Calibration";
     const QString ThrottleFPSIfNotFocus = "Throttle FPS If Not Focus"; // FIXME - this value duplicated in Basic2DWindowOpenGLDisplayPlugin.cpp
     const QString ToggleHipsFollowing = "Toggle Hips Following";
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 089ff4c2bf..54785933c9 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -99,6 +99,16 @@ static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStan
 static const QString USER_RECENTER_MODEL_AUTO = QStringLiteral("Auto");
 static const QString USER_RECENTER_MODEL_DISABLE_HMD_LEAN = QStringLiteral("DisableHMDLean");
 
+const QString HEAD_BLEND_DIRECTIONAL_ALPHA_NAME = "lookAroundAlpha";
+const QString HEAD_BLEND_LINEAR_ALPHA_NAME = "lookBlendAlpha";
+const float HEAD_ALPHA_BLENDING = 1.0f;
+
+const QString POINT_REACTION_NAME = "point";
+const QString POINT_BLEND_DIRECTIONAL_ALPHA_NAME = "pointAroundAlpha";
+const QString POINT_BLEND_LINEAR_ALPHA_NAME = "pointBlendAlpha";
+const QString POINT_REF_JOINT_NAME = "RightShoulder";
+const float POINT_ALPHA_BLENDING = 1.0f;
+
 MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) {
     if (str == USER_RECENTER_MODEL_FORCE_SIT) {
         return MyAvatar::ForceSit;
@@ -451,7 +461,7 @@ QByteArray MyAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropF
     _globalBoundingBoxDimensions.y = _characterController.getCapsuleHalfHeight();
     _globalBoundingBoxDimensions.z = _characterController.getCapsuleRadius();
     _globalBoundingBoxOffset = _characterController.getCapsuleLocalOffset();
-    if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_INDEPENDENT) {
+    if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_INDEPENDENT || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
         // fake the avatar position that is sent up to the AvatarMixer
         glm::vec3 oldPosition = getWorldPosition();
         setWorldPosition(getSkeletonPosition());
@@ -772,6 +782,18 @@ void MyAvatar::update(float deltaTime) {
     emit energyChanged(currentEnergy);
 
     updateEyeContactTarget(deltaTime);
+
+    // if we're getting eye rotations from a tracker, disable observer-side procedural eye motions
+    auto userInputMapper = DependencyManager::get<UserInputMapper>();
+    bool eyesTracked =
+        userInputMapper->getPoseState(controller::Action::LEFT_EYE).valid &&
+        userInputMapper->getPoseState(controller::Action::RIGHT_EYE).valid;
+
+    int leftEyeJointIndex = getJointIndex("LeftEye");
+    int rightEyeJointIndex = getJointIndex("RightEye");
+    bool eyesAreOverridden = getIsJointOverridden(leftEyeJointIndex) || getIsJointOverridden(rightEyeJointIndex);
+
+    _headData->setHasProceduralEyeMovement(!(eyesTracked || eyesAreOverridden));
 }
 
 void MyAvatar::updateEyeContactTarget(float deltaTime) {
@@ -932,10 +954,20 @@ void MyAvatar::simulate(float deltaTime, bool inView) {
             qCDebug(interfaceapp) << "MyAvatar::simulate headPosition is NaN";
             headPosition = glm::vec3(0.0f);
         }
-
         head->setPosition(headPosition);
         head->setScale(getModelScale());
         head->simulate(deltaTime);
+        CameraMode mode = qApp->getCamera().getMode();
+        if (_scriptControlsHeadLookAt || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
+            if (!_pointAtActive || !_isPointTargetValid) {
+                updateHeadLookAt(deltaTime);
+            } else {
+                resetHeadLookAt();
+            }
+        } else if (_headLookAtActive){
+            resetHeadLookAt();
+            _headLookAtActive = false;            
+        }
     }
 
     // Record avatars movements.
@@ -1454,8 +1486,50 @@ void MyAvatar::setEnableDebugDrawHandControllers(bool isEnabled) {
     _enableDebugDrawHandControllers = isEnabled;
 
     if (!isEnabled) {
-        DebugDraw::getInstance().removeMarker("leftHandController");
-        DebugDraw::getInstance().removeMarker("rightHandController");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND");
+
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_THUMB1");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_THUMB2");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_THUMB3");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_THUMB4");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_INDEX1");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_INDEX2");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_INDEX3");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_INDEX4");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_MIDDLE1");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_MIDDLE2");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_MIDDLE3");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_MIDDLE4");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_RING1");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_RING2");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_RING3");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_RING4");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_PINKY1");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_PINKY2");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_PINKY3");
+        DebugDraw::getInstance().removeMarker("LEFT_HAND_PINKY4");
+
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_THUMB1");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_THUMB2");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_THUMB3");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_THUMB4");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_INDEX1");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_INDEX2");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_INDEX3");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_INDEX4");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_MIDDLE1");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_MIDDLE2");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_MIDDLE3");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_MIDDLE4");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_RING1");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_RING2");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_RING3");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_RING4");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_PINKY1");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_PINKY2");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_PINKY3");
+        DebugDraw::getInstance().removeMarker("RIGHT_HAND_PINKY4");
     }
 }
 
@@ -2556,7 +2630,7 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
 
 glm::vec3 MyAvatar::getSkeletonPosition() const {
     CameraMode mode = qApp->getCamera().getMode();
-    if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_INDEPENDENT) {
+    if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_INDEPENDENT || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
         // The avatar is rotated PI about the yAxis, so we have to correct for it
         // to get the skeleton offset contribution in the world-frame.
         const glm::quat FLIP = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
@@ -2644,7 +2718,11 @@ void MyAvatar::updateMotors() {
     if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) {
         if (_characterController.getState() == CharacterController::State::Hover ||
                 _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) {
-            motorRotation = getMyHead()->getHeadOrientation();
+            if (qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT || qApp->getCamera().getMode() == CAMERA_MODE_SELFIE) {
+                motorRotation = getLookAtRotation();
+            } else {
+                motorRotation = getMyHead()->getHeadOrientation();
+            }
         } else {
             // non-hovering = walking: follow camera twist about vertical but not lift
             // we decompose camera's rotation and store the twist part in motorRotation
@@ -3079,7 +3157,6 @@ void MyAvatar::initAnimGraph() {
     }
 
     emit animGraphUrlChanged(graphUrl);
-
     _skeletonModel->getRig().initAnimGraph(graphUrl);
     _currentAnimGraphUrl.set(graphUrl);
     connect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
@@ -3097,6 +3174,16 @@ void MyAvatar::animGraphLoaded() {
     disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
 }
 
+void MyAvatar::debugDrawPose(controller::Action action, const char* channelName, float size) {
+    auto pose = getControllerPoseInWorldFrame(action);
+    if (pose.isValid()) {
+        DebugDraw::getInstance().addMarker(channelName, pose.getRotation(), pose.getTranslation(), glm::vec4(1), size);
+    } else {
+        DebugDraw::getInstance().removeMarker(channelName);
+    }
+}
+
+
 void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     Avatar::postUpdate(deltaTime, scene);
@@ -3137,20 +3224,50 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
     }
 
     if (_enableDebugDrawHandControllers) {
-        auto leftHandPose = getControllerPoseInWorldFrame(controller::Action::LEFT_HAND);
-        auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND);
+        debugDrawPose(controller::Action::LEFT_HAND, "LEFT_HAND", 1.0);
+        debugDrawPose(controller::Action::RIGHT_HAND, "RIGHT_HAND", 1.0);
 
-        if (leftHandPose.isValid()) {
-            DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1));
-        } else {
-            DebugDraw::getInstance().removeMarker("leftHandController");
-        }
+        debugDrawPose(controller::Action::LEFT_HAND_THUMB1, "LEFT_HAND_THUMB1", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_THUMB2, "LEFT_HAND_THUMB2", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_THUMB3, "LEFT_HAND_THUMB3", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_THUMB4, "LEFT_HAND_THUMB4", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_INDEX1, "LEFT_HAND_INDEX1", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_INDEX2, "LEFT_HAND_INDEX2", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_INDEX3, "LEFT_HAND_INDEX3", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_INDEX4, "LEFT_HAND_INDEX4", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_MIDDLE1, "LEFT_HAND_MIDDLE1", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_MIDDLE2, "LEFT_HAND_MIDDLE2", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_MIDDLE3, "LEFT_HAND_MIDDLE3", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_MIDDLE4, "LEFT_HAND_MIDDLE4", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_RING1, "LEFT_HAND_RING1", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_RING2, "LEFT_HAND_RING2", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_RING3, "LEFT_HAND_RING3", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_RING4, "LEFT_HAND_RING4", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_PINKY1, "LEFT_HAND_PINKY1", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_PINKY2, "LEFT_HAND_PINKY2", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_PINKY3, "LEFT_HAND_PINKY3", 0.1f);
+        debugDrawPose(controller::Action::LEFT_HAND_PINKY4, "LEFT_HAND_PINKY4", 0.1f);
 
-        if (rightHandPose.isValid()) {
-            DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1));
-        } else {
-            DebugDraw::getInstance().removeMarker("rightHandController");
-        }
+        debugDrawPose(controller::Action::RIGHT_HAND_THUMB1, "RIGHT_HAND_THUMB1", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_THUMB2, "RIGHT_HAND_THUMB2", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_THUMB3, "RIGHT_HAND_THUMB3", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_THUMB4, "RIGHT_HAND_THUMB4", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_INDEX1, "RIGHT_HAND_INDEX1", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_INDEX2, "RIGHT_HAND_INDEX2", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_INDEX3, "RIGHT_HAND_INDEX3", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_INDEX4, "RIGHT_HAND_INDEX4", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_MIDDLE1, "RIGHT_HAND_MIDDLE1", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_MIDDLE2, "RIGHT_HAND_MIDDLE2", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_MIDDLE3, "RIGHT_HAND_MIDDLE3", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_MIDDLE4, "RIGHT_HAND_MIDDLE4", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_RING1, "RIGHT_HAND_RING1", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_RING2, "RIGHT_HAND_RING2", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_RING3, "RIGHT_HAND_RING3", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_RING4, "RIGHT_HAND_RING4", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_PINKY1, "RIGHT_HAND_PINKY1", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_PINKY2, "RIGHT_HAND_PINKY2", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_PINKY3, "RIGHT_HAND_PINKY3", 0.1f);
+        debugDrawPose(controller::Action::RIGHT_HAND_PINKY4, "RIGHT_HAND_PINKY4", 0.1f);
     }
 
     DebugDraw::getInstance().updateMyAvatarPos(getWorldPosition());
@@ -3322,11 +3439,19 @@ void MyAvatar::setRotationThreshold(float angleRadians) {
 }
 
 void MyAvatar::updateOrientation(float deltaTime) {
-
     //  Smoothly rotate body with arrow keys
     float targetSpeed = getDriveKey(YAW) * _yawSpeed;
+    CameraMode mode = qApp->getCamera().getMode();
+    bool computeLookAt = (mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) && isReadyForPhysics() && !qApp->isHMDMode();
+    if (computeLookAt) {
+        // For "Look At" and "Selfie" camera modes we also smooth the yaw rotation from right-click mouse movement.
+        float speedFromDeltaYaw = deltaTime > FLT_EPSILON ? getDriveKey(DELTA_YAW) / deltaTime : 0.0f;
+        speedFromDeltaYaw *= _yawSpeed / YAW_SPEED_DEFAULT;
+        targetSpeed += speedFromDeltaYaw;
+    }
+
     if (targetSpeed != 0.0f) {
-        const float ROTATION_RAMP_TIMESCALE = 0.1f;
+        const float ROTATION_RAMP_TIMESCALE = 0.5f;
         float blend = deltaTime / ROTATION_RAMP_TIMESCALE;
         if (blend > 1.0f) {
             blend = 1.0f;
@@ -3347,10 +3472,10 @@ void MyAvatar::updateOrientation(float deltaTime) {
         }
     }
     float totalBodyYaw = _bodyYawDelta * deltaTime;
-
-    // Rotate directly proportional to delta yaw and delta pitch from right-click mouse movement.
-    totalBodyYaw += getDriveKey(DELTA_YAW) * _yawSpeed / YAW_SPEED_DEFAULT;
-
+    if (!computeLookAt) {
+        // Rotate directly proportional to delta yaw and delta pitch from right-click mouse movement.
+        totalBodyYaw += getDriveKey(DELTA_YAW) * _yawSpeed / YAW_SPEED_DEFAULT;
+    }
     // Comfort Mode: If you press any of the left/right rotation drive keys or input, you'll
     // get an instantaneous 15 degree turn. If you keep holding the key down you'll get another
     // snap turn every half second.
@@ -3359,7 +3484,6 @@ void MyAvatar::updateOrientation(float deltaTime) {
         totalBodyYaw += getDriveKey(STEP_YAW);
         snapTurn = true;
     }
-
     // Use head/HMD roll to turn while flying, but not when standing still.
     if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) {
 
@@ -3394,7 +3518,64 @@ void MyAvatar::updateOrientation(float deltaTime) {
 
     // update body orientation by movement inputs
     glm::quat initialOrientation = getOrientationOutbound();
-    setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, totalBodyYaw, 0.0f))));
+    glm::vec3 eyesPosition = getDefaultEyePosition();
+    const float FPS = 60.0f;
+    float timeScale = deltaTime * FPS;
+
+    bool faceForward = false;
+    bool isMovingFwdBwd = getDriveKey(TRANSLATE_Z) != 0.0f;
+    bool isMovingSideways = getDriveKey(TRANSLATE_X) != 0.0f;
+    bool isCameraYawing = getDriveKey(DELTA_YAW) + getDriveKey(STEP_YAW) + getDriveKey(YAW) != 0.0f;
+    bool isRotatingWhileSeated = !isCameraYawing && isMovingSideways && _characterController.getSeated();
+    glm::quat previousOrientation = getWorldOrientation();
+
+    if (!computeLookAt) {
+        setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, totalBodyYaw, 0.0f))));
+        _lookAtCameraTarget = eyesPosition + getWorldOrientation() * Vectors::FRONT;
+        _lookAtYaw = getWorldOrientation();
+        _lookAtPitch = Quaternions::IDENTITY;
+    } else {
+        // Compute new look at vectors
+        if (totalBodyYaw != 0.0f) {
+            _lookAtYaw = _lookAtYaw * glm::quat(glm::radians(glm::vec3(0.0f, totalBodyYaw, 0.0f)));
+        }
+        float pitchIncrement = getDriveKey(PITCH) * _pitchSpeed * deltaTime
+            + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT;
+        if (pitchIncrement != 0.0f) {
+            glm::quat _previousLookAtPitch = _lookAtPitch;
+            _lookAtPitch = _lookAtPitch * glm::quat(glm::radians(glm::vec3(pitchIncrement, 0.0f, 0.0f)));
+            // Limit the camera horizontal pitch
+            float MAX_LOOK_AT_PITCH_DEGREES = 80.0f;
+            float pitchFromHorizont = glm::degrees(angleBetween(getLookAtRotation() * Vectors::FRONT, _lookAtYaw * Vectors::FRONT));
+            if (pitchFromHorizont > MAX_LOOK_AT_PITCH_DEGREES) {
+                _lookAtPitch = _previousLookAtPitch;
+            }
+        }
+
+        faceForward = isMovingFwdBwd || (isMovingSideways && !isRotatingWhileSeated);
+        // Blend the avatar orientation with the camera look at if moving forward.
+        if (faceForward || _shouldTurnToFaceCamera) {
+            const float REORIENT_FORWARD_BLEND = 0.25f;
+            const float REORIENT_TURN_BLEND = 0.03f;
+            const float DIAGONAL_TURN_BLEND = 0.02f;
+            float blend = (_shouldTurnToFaceCamera ? REORIENT_TURN_BLEND : REORIENT_FORWARD_BLEND) * timeScale;
+            if (blend > 1.0f) {
+                blend = 1.0f;
+            }
+            glm::quat faceRotation = _lookAtYaw;
+            if (isMovingFwdBwd && isMovingSideways) {
+                // Reorient avatar to face camera diagonal
+                blend = DIAGONAL_TURN_BLEND;
+                float turnSign = getDriveKey(TRANSLATE_Z) < 0.0f ? -1.0f : 1.0f;
+                turnSign = getDriveKey(TRANSLATE_X) > 0.0f ? -turnSign : turnSign;
+                faceRotation = _lookAtYaw * glm::angleAxis(turnSign * 0.25f * PI, Vectors::UP);
+            }
+            setWorldOrientation(glm::slerp(getWorldOrientation(), faceRotation, blend));
+        } else if (isRotatingWhileSeated) {
+            float rotatingWhileSeatedYaw = -getDriveKey(TRANSLATE_X) * _yawSpeed * deltaTime;
+            setWorldOrientation(getWorldOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, rotatingWhileSeatedYaw, 0.0f))));
+        }
+    }
 
     if (snapTurn) {
         // Whether or not there is an existing smoothing going on, just reset the smoothing timer and set the starting position as the avatar's current position, then smooth to the new position.
@@ -3415,9 +3596,77 @@ void MyAvatar::updateOrientation(float deltaTime) {
         head->setBaseYaw(YAW(euler));
         head->setBasePitch(PITCH(euler));
         head->setBaseRoll(ROLL(euler));
+    } else if (computeLookAt) {
+        // Reset head orientation before applying the blending offset
+        head->setBaseYaw(0.0f);
+        head->setBasePitch(0.0f);
+        head->setBaseRoll(0.0f);
+
+        glm::vec3 cameraVector = (faceForward ? _lookAtPitch * getWorldOrientation() : getLookAtRotation()) * Vectors::FRONT;
+        glm::vec3 cameraYawVector = _lookAtYaw * Vectors::FRONT;
+
+        // Cap and attenuate head's lookat pitch angle
+        const float START_LOOKING_UP_DEGREES = 5.0f;
+        const float START_LOOKING_DOWN_DEGREES = 15.0f;
+        const float MAX_UP_DOWN_DEGREES = 90.0f;
+
+        glm::vec3 avatarVectorUp = getWorldOrientation() * Vectors::UP;
+        float upDownDot = glm::dot(cameraVector, avatarVectorUp);
+        float upDownDegrees = MAX_UP_DOWN_DEGREES - glm::degrees(acosf(abs(upDownDot)));
+
+        float lookAttenuation = 0.0f;
+        if (upDownDot <= 0.0f) {
+            if (upDownDegrees > START_LOOKING_DOWN_DEGREES) {
+                lookAttenuation = (upDownDegrees - START_LOOKING_DOWN_DEGREES) / (MAX_UP_DOWN_DEGREES - START_LOOKING_DOWN_DEGREES);
+            }
+        } else {
+            if (upDownDegrees > START_LOOKING_UP_DEGREES) {
+                lookAttenuation = (upDownDegrees - START_LOOKING_UP_DEGREES) / (MAX_UP_DOWN_DEGREES - START_LOOKING_UP_DEGREES);
+            }
+        }
+        glm::vec3 avatarVectorFront = getWorldOrientation() * Vectors::FRONT;
+        float frontBackDot = glm::dot(cameraYawVector, avatarVectorFront);
+
+        glm::vec3 avatarVectorRight = getWorldOrientation() * Vectors::RIGHT;
+        float leftRightDot = glm::dot(cameraYawVector, avatarVectorRight);
+
+        const float REORIENT_ANGLE = 65.0f;
+        const float TRIGGER_REORIENT_ANGLE = 45.0f;
+        glm::vec3 ajustedYawVector = cameraYawVector;
+        if (frontBackDot < 0.0f) {
+            ajustedYawVector = (leftRightDot < 0.0f ? -avatarVectorRight : avatarVectorRight);
+            cameraVector = (ajustedYawVector * _lookAtPitch) * Vectors::FRONT;
+            if (!isRotatingWhileSeated) {
+                if (frontBackDot < -glm::sin(glm::radians(TRIGGER_REORIENT_ANGLE))) {
+                    _shouldTurnToFaceCamera = true;
+                }
+            } else {
+                setWorldOrientation(previousOrientation);
+            }
+        } else if (frontBackDot > glm::sin(glm::radians(REORIENT_ANGLE))) {
+            _shouldTurnToFaceCamera = false;
+        }
+
+        cameraVector = glm::mix(cameraVector, ajustedYawVector, 1.0f - lookAttenuation);
+        // Calculate the camera target point.
+
+        glm::vec3 targetPoint = eyesPosition + glm::normalize(cameraVector);
+
+        const float LOOKAT_MIX_ALPHA = 0.25f;
+        if (!isFlying() || !hasDriveInput()) {
+            // Approximate the head's look at vector to the camera look at vector with some delay.
+            float mixAlpha = LOOKAT_MIX_ALPHA * timeScale;
+            if (mixAlpha > 1.0f) {
+                mixAlpha = 1.0f;
+            }
+            _lookAtCameraTarget = glm::mix(_lookAtCameraTarget, targetPoint, mixAlpha);
+        } else {
+            _lookAtCameraTarget = targetPoint;
+        }
+        _headLookAtActive = true;
     } else {
         head->setBaseYaw(0.0f);
-        head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime 
+        head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime
             + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT);
         head->setBaseRoll(0.0f);
     }
@@ -3449,7 +3698,7 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) {
 glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 right) {
     float stickFullOn = 0.85f;
     auto zSpeed = getDriveKey(TRANSLATE_Z);
-    auto xSpeed = getDriveKey(TRANSLATE_X);
+    auto xSpeed = !_characterController.getSeated() ? getDriveKey(TRANSLATE_X) : 0.0f;
     glm::vec3 direction;
     if (!useAdvancedMovementControls() && qApp->isHMDMode()) {
         // Walking disabled in settings.
@@ -3487,6 +3736,10 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig
     } else {
         // Desktop mode.
         direction = (zSpeed * forward) + (xSpeed * right);
+        if (qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT && zSpeed != 0.0f && xSpeed != 0.0f){
+            direction = (zSpeed * forward);
+        }
+        
         auto length = glm::length(direction);
         if (length > EPSILON) {
             direction /= length;
@@ -3586,6 +3839,8 @@ void MyAvatar::updateActionMotor(float deltaTime) {
         float speedGrowthTimescale  = 2.0f;
         float speedIncreaseFactor = 1.8f * _walkSpeedScalar;
         motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor;
+        // use feedback from CharacterController to prevent tunneling under high motorspeed
+        motorSpeed *= _characterController.getCollisionBrakeAttenuationFactor();
         const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED;
 
         if (_isPushing) {
@@ -3909,6 +4164,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition,
         _goToOrientation = quatOrientation;
     }
 
+    resetLookAtRotation(_goToPosition, _goToOrientation);
     emit transformChanged();
 }
 
@@ -4372,8 +4628,15 @@ float MyAvatar::getRawDriveKey(DriveKeys key) const {
 }
 
 void MyAvatar::relayDriveKeysToCharacterController() {
-    if (getDriveKey(TRANSLATE_Y) > 0.0f && (!qApp->isHMDMode() || (useAdvancedMovementControls() && getFlyingHMDPref()))) {
-        _characterController.jump();
+    if (_endSitKeyPressComplete) {
+        if (getDriveKey(TRANSLATE_Y) > 0.0f && (!qApp->isHMDMode() || (useAdvancedMovementControls() && getFlyingHMDPref()))) {
+            _characterController.jump();
+        }
+    } else {
+        // used to prevent character from jumping after endSit is called.
+        if (getDriveKey(TRANSLATE_Y) == 0.0f) {
+            _endSitKeyPressComplete = true;
+        }
     }
 }
 
@@ -5133,9 +5396,13 @@ glm::quat MyAvatar::getOrientationForAudio() {
     glm::quat result;
 
     switch (_audioListenerMode) {
-        case AudioListenerMode::FROM_HEAD:
-            result = getHead()->getFinalOrientationInWorldFrame();
+        case AudioListenerMode::FROM_HEAD: {
+            // Using the camera's orientation instead, when the current mode is controlling the avatar's head.
+            CameraMode mode = qApp->getCamera().getMode();
+            bool headFollowsCamera = mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE;
+            result = headFollowsCamera ? qApp->getCamera().getOrientation() : getHead()->getFinalOrientationInWorldFrame();
             break;
+        }
         case AudioListenerMode::FROM_CAMERA:
             result = qApp->getCamera().getOrientation();
             break;
@@ -5750,6 +6017,7 @@ bool MyAvatar::pinJoint(int index, const glm::vec3& position, const glm::quat& o
     }
 
     slamPosition(position);
+    resetLookAtRotation(position, orientation);
     setWorldOrientation(orientation);
 
     auto it = std::find(_pinnedJoints.begin(), _pinnedJoints.end(), index);
@@ -5854,6 +6122,10 @@ bool MyAvatar::beginReaction(QString reactionName) {
     if (reactionIndex >= 0 && reactionIndex < (int)NUM_AVATAR_BEGIN_END_REACTIONS) {
         std::lock_guard<std::mutex> guard(_reactionLock);
         _reactionEnabledRefCounts[reactionIndex]++;
+        if (reactionName == POINT_REACTION_NAME) {
+            _pointAtActive = true;
+            _isPointTargetValid = true;
+        }
         return true;
     }
     return false;
@@ -5863,13 +6135,18 @@ bool MyAvatar::endReaction(QString reactionName) {
     int reactionIndex = beginEndReactionNameToIndex(reactionName);
     if (reactionIndex >= 0 && reactionIndex < (int)NUM_AVATAR_BEGIN_END_REACTIONS) {
         std::lock_guard<std::mutex> guard(_reactionLock);
+        bool wasReactionActive = true;
         if (_reactionEnabledRefCounts[reactionIndex] > 0) {
             _reactionEnabledRefCounts[reactionIndex]--;
-            return true;
+            wasReactionActive = true;
         } else {
             _reactionEnabledRefCounts[reactionIndex] = 0;
-            return false;
+            wasReactionActive = false;
         }
+        if (reactionName == POINT_REACTION_NAME) {
+            _pointAtActive = _reactionEnabledRefCounts[reactionIndex] > 0;
+        }
+        return wasReactionActive;
     }
     return false;
 }
@@ -5880,10 +6157,13 @@ void MyAvatar::updateRigControllerParameters(Rig::ControllerParameters& params)
     for (int i = 0; i < TRIGGER_REACTION_NAMES.size(); i++) {
         params.reactionTriggers[i] = _reactionTriggers[i];
     }
-
+    int pointReactionIndex = beginEndReactionNameToIndex("point");
     for (int i = 0; i < BEGIN_END_REACTION_NAMES.size(); i++) {
         // copy current state into params.
         params.reactionEnabledFlags[i] = _reactionEnabledRefCounts[i] > 0;
+        if (params.reactionEnabledFlags[i] && i == pointReactionIndex) {
+            params.reactionEnabledFlags[i] = _isPointTargetValid;
+        }
     }
 
     for (int i = 0; i < TRIGGER_REACTION_NAMES.size(); i++) {
@@ -6231,7 +6511,6 @@ void MyAvatar::sendPacket(const QUuid& entityID) const {
 
 void MyAvatar::setSitDriveKeysStatus(bool enabled) {
     const std::vector<DriveKeys> DISABLED_DRIVE_KEYS_DURING_SIT = {
-        DriveKeys::TRANSLATE_X,
         DriveKeys::TRANSLATE_Y,
         DriveKeys::TRANSLATE_Z,
         DriveKeys::STEP_TRANSLATE_X,
@@ -6253,15 +6532,17 @@ void MyAvatar::beginSit(const glm::vec3& position, const glm::quat& rotation) {
         return;
     }
 
-    _characterController.setSeated(true);
-    setCollisionsEnabled(false);
-    setHMDLeanRecenterEnabled(false);
-    // Disable movement
-    setSitDriveKeysStatus(false);
-    centerBody();
-    int hipIndex = getJointIndex("Hips");
-    clearPinOnJoint(hipIndex);
-    pinJoint(hipIndex, position, rotation);
+    if (!_characterController.getSeated()) {
+        _characterController.setSeated(true);
+        setCollisionsEnabled(false);
+        setHMDLeanRecenterEnabled(false);
+        // Disable movement
+        setSitDriveKeysStatus(false);
+        centerBody();
+        int hipIndex = getJointIndex("Hips");
+        clearPinOnJoint(hipIndex);
+        pinJoint(hipIndex, position, rotation);
+    }
 }
 
 void MyAvatar::endSit(const glm::vec3& position, const glm::quat& rotation) {
@@ -6279,12 +6560,237 @@ void MyAvatar::endSit(const glm::vec3& position, const glm::quat& rotation) {
         slamPosition(position);
         setWorldOrientation(rotation);
 
-        // the jump key is used to exit the chair.  We add a delay here to prevent
-        // the avatar from jumping right as they exit the chair.
-        float TIME_BEFORE_DRIVE_ENABLED_MS = 150.0f;
-        QTimer::singleShot(TIME_BEFORE_DRIVE_ENABLED_MS, [this]() {
-            // Enable movement again
-            setSitDriveKeysStatus(true);
-        });
+        // used to prevent character from jumping after endSit is called.
+        _endSitKeyPressComplete = false;
+
+        setSitDriveKeysStatus(true);
+    }
+}
+
+bool MyAvatar::getIsJointOverridden(int jointIndex) const {
+    // has this joint been set by a script?
+    return _skeletonModel->getIsJointOverridden(jointIndex);
+}
+
+void MyAvatar::updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera) {
+
+    updateLookAtTargetAvatar();
+
+    bool isLookingAtSomeone = false;
+    glm::vec3 lookAtSpot;
+
+    const MyHead* myHead = getMyHead();
+
+    int leftEyeJointIndex = getJointIndex("LeftEye");
+    int rightEyeJointIndex = getJointIndex("RightEye");
+    bool eyesAreOverridden = getIsJointOverridden(leftEyeJointIndex) ||
+        getIsJointOverridden(rightEyeJointIndex);
+    if (eyesAreOverridden) {
+        // A script has set the eye rotations, so use these to set lookAtSpot
+        glm::quat leftEyeRotation = getAbsoluteJointRotationInObjectFrame(leftEyeJointIndex);
+        glm::quat rightEyeRotation = getAbsoluteJointRotationInObjectFrame(rightEyeJointIndex);
+        glm::vec3 leftVec = getWorldOrientation() * leftEyeRotation * IDENTITY_FORWARD;
+        glm::vec3 rightVec = getWorldOrientation() * rightEyeRotation * IDENTITY_FORWARD;
+        glm::vec3 leftEyePosition = myHead->getLeftEyePosition();
+        glm::vec3 rightEyePosition = myHead->getRightEyePosition();
+        float t1, t2;
+        bool success = findClosestApproachOfLines(leftEyePosition, leftVec, rightEyePosition, rightVec, t1, t2);
+        if (success) {
+            glm::vec3 leftFocus = leftEyePosition + leftVec * t1;
+            glm::vec3 rightFocus = rightEyePosition + rightVec * t2;
+            lookAtSpot = (leftFocus + rightFocus) / 2.0f; // average
+        } else {
+            lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 1000.0f;
+        }
+    } else {
+        controller::Pose leftEyePose = getControllerPoseInAvatarFrame(controller::Action::LEFT_EYE);
+        controller::Pose rightEyePose = getControllerPoseInAvatarFrame(controller::Action::RIGHT_EYE);
+        if (leftEyePose.isValid() && rightEyePose.isValid()) {
+            // an eye tracker is in use, set lookAtSpot from this
+            glm::vec3 leftVec = getWorldOrientation() * leftEyePose.rotation * glm::vec3(0.0f, 0.0f, -1.0f);
+            glm::vec3 rightVec = getWorldOrientation() * rightEyePose.rotation * glm::vec3(0.0f, 0.0f, -1.0f);
+
+            glm::vec3 leftEyePosition = myHead->getLeftEyePosition();
+            glm::vec3 rightEyePosition = myHead->getRightEyePosition();
+            float t1, t2;
+            bool success = findClosestApproachOfLines(leftEyePosition, leftVec, rightEyePosition, rightVec, t1, t2);
+            if (success) {
+                glm::vec3 leftFocus = leftEyePosition + leftVec * t1;
+                glm::vec3 rightFocus = rightEyePosition + rightVec * t2;
+                lookAtSpot = (leftFocus + rightFocus) / 2.0f; // average
+            } else {
+                lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 1000.0f;
+            }
+        } else {
+            // no script override, no eye tracker, so do procedural eye motion
+            AvatarSharedPointer lookingAt = getLookAtTargetAvatar().lock();
+            bool haveLookAtCandidate = lookingAt && this != lookingAt.get();
+            auto avatar = static_pointer_cast<Avatar>(lookingAt);
+            bool mutualLookAtSnappingEnabled =
+                avatar && avatar->getLookAtSnappingEnabled() && getLookAtSnappingEnabled();
+            if (haveLookAtCandidate && mutualLookAtSnappingEnabled) {
+                //  If I am looking at someone else, look directly at one of their eyes
+                isLookingAtSomeone = true;
+                auto lookingAtHead = avatar->getHead();
+
+                const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE;
+                glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FORWARD;
+                glm::vec3 fromLookingAtToMe = glm::normalize(getHead()->getEyePosition()
+                                                             - lookingAtHead->getEyePosition());
+                float faceAngle = glm::angle(lookingAtFaceOrientation, fromLookingAtToMe);
+
+                if (faceAngle < MAXIMUM_FACE_ANGLE) {
+                    // Randomly look back and forth between look targets
+                    eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ?
+                        LEFT_EYE : getEyeContactTarget();
+                    switch (target) {
+                        case LEFT_EYE:
+                            lookAtSpot = lookingAtHead->getLeftEyePosition();
+                            break;
+                        case RIGHT_EYE:
+                            lookAtSpot = lookingAtHead->getRightEyePosition();
+                            break;
+                        case MOUTH:
+                            lookAtSpot = lookingAtHead->getMouthPosition();
+                            break;
+                    }
+                } else {
+                    // Just look at their head (mid point between eyes)
+                    lookAtSpot = lookingAtHead->getEyePosition();
+                }
+            } else {
+                //  I am not looking at anyone else, so just look forward
+                auto headPose = getControllerPoseInWorldFrame(controller::Action::HEAD);
+                if (headPose.isValid()) {
+                    lookAtSpot = transformPoint(headPose.getMatrix(), glm::vec3(0.0f, 0.0f, TREE_SCALE));
+                } else {
+                    lookAtSpot = myHead->getEyePosition() +
+                        (getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));
+                }
+            }
+
+            // Deflect the eyes a bit to match the detected gaze from the face tracker if active.
+            if (faceTracker && !faceTracker->isMuted()) {
+                float eyePitch = faceTracker->getEstimatedEyePitch();
+                float eyeYaw = faceTracker->getEstimatedEyeYaw();
+                const float GAZE_DEFLECTION_REDUCTION_DURING_EYE_CONTACT = 0.1f;
+                glm::vec3 origin = myHead->getEyePosition();
+                float deflection = faceTracker->getEyeDeflection();
+                if (isLookingAtSomeone) {
+                    deflection *= GAZE_DEFLECTION_REDUCTION_DURING_EYE_CONTACT;
+                }
+                lookAtSpot = origin + myCamera.getOrientation() * glm::quat(glm::radians(glm::vec3(
+                    eyePitch * deflection, eyeYaw * deflection, 0.0f))) *
+                    glm::inverse(myCamera.getOrientation()) * (lookAtSpot - origin);
+            }
+        }
+    }
+
+    getHead()->setLookAtPosition(lookAtSpot);
+}
+
+glm::vec3 MyAvatar::aimToBlendValues(const glm::vec3& aimVector, const glm::quat& frameOrientation) {
+    // This method computes the values for the directional blending animation node
+
+    glm::vec3 uVector = glm::normalize(frameOrientation * Vectors::UNIT_X);
+    glm::vec3 vVector = glm::normalize(frameOrientation * Vectors::UNIT_Y);
+
+    glm::vec3 aimDirection;
+    if (glm::length(aimVector) > EPSILON) {
+        aimDirection = glm::normalize(aimVector);
+    } else {
+        // aim vector is zero
+        return glm::vec3();
+    }
+
+    float xDot = glm::dot(uVector, aimDirection);
+    float yDot = glm::dot(vVector, aimDirection);
+
+    // Make sure dot products are in range to avoid acosf returning NaN
+    xDot = glm::min(glm::max(xDot, -1.0f), 1.0f);
+    yDot = glm::min(glm::max(yDot, -1.0f), 1.0f);
+
+    float xAngle = acosf(xDot);
+    float yAngle = acosf(yDot);
+
+    // xBlend and yBlend are the values from -1.0 to 1.0 that set the directional blending.
+    // We compute them using the angles (0 to PI/2) => (1.0 to 0.0) and (PI/2 to PI) => (0.0 to -1.0)
+    float xBlend = -(xAngle - 0.5f * PI) / (0.5f * PI);
+    float yBlend = -(yAngle - 0.5f * PI) / (0.5f * PI);
+    glm::vec3 blendValues = glm::vec3(xBlend, yBlend, 0.0f);
+    return blendValues;
+}
+
+void MyAvatar::resetHeadLookAt() {
+    if (_skeletonModelLoaded) {
+        _skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
+                                                        HEAD_BLEND_LINEAR_ALPHA_NAME, HEAD_ALPHA_BLENDING);
+    }
+}
+
+void MyAvatar::resetLookAtRotation(const glm::vec3& avatarPosition, const glm::quat& avatarOrientation) {
+    // Align the look at values to the given avatar orientation
+    float yaw = safeEulerAngles(avatarOrientation).y;
+    _lookAtYaw = glm::angleAxis(yaw, avatarOrientation * Vectors::UP);
+    _lookAtPitch = Quaternions::IDENTITY;
+    _lookAtCameraTarget =  avatarPosition + avatarOrientation * Vectors::FRONT;
+    resetHeadLookAt();
+}
+
+void MyAvatar::updateHeadLookAt(float deltaTime) {    
+    if (_skeletonModelLoaded) {
+        glm::vec3 lookAtTarget = _scriptControlsHeadLookAt ? _lookAtScriptTarget : _lookAtCameraTarget;
+        glm::vec3 aimVector = lookAtTarget - getDefaultEyePosition();
+        glm::vec3 lookAtBlend = MyAvatar::aimToBlendValues(aimVector, getWorldOrientation());
+        _skeletonModel->getRig().setDirectionalBlending(HEAD_BLEND_DIRECTIONAL_ALPHA_NAME, lookAtBlend,
+                                                        HEAD_BLEND_LINEAR_ALPHA_NAME, HEAD_ALPHA_BLENDING);
+
+        if (_scriptControlsHeadLookAt) {
+            _scriptHeadControlTimer += deltaTime;
+            if (_scriptHeadControlTimer > MAX_LOOK_AT_TIME_SCRIPT_CONTROL) {
+                _scriptHeadControlTimer = 0.0f;
+                _scriptControlsHeadLookAt = false;
+                _lookAtCameraTarget = _lookAtScriptTarget;
+            }
+        }
+    }
+}
+
+void MyAvatar::setHeadLookAt(const glm::vec3& lookAtTarget) {
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "setHeadLookAt",
+            Q_ARG(const glm::vec3&, lookAtTarget));
+        return;
+    }
+    _headLookAtActive = true;
+    _scriptControlsHeadLookAt = true;
+    _scriptHeadControlTimer = 0.0f;
+    _lookAtScriptTarget = lookAtTarget;
+}
+
+bool MyAvatar::setPointAt(const glm::vec3& pointAtTarget) {
+    if (QThread::currentThread() != thread()) {
+        bool result = false;
+        BLOCKING_INVOKE_METHOD(this, "setPointAt", Q_RETURN_ARG(bool, result),
+            Q_ARG(const glm::vec3&, pointAtTarget));
+        return result;
+    }
+    if (_skeletonModelLoaded && _pointAtActive) {
+        glm::vec3 aimVector = pointAtTarget - getJointPosition(POINT_REF_JOINT_NAME);
+        _isPointTargetValid = glm::dot(aimVector, getWorldOrientation() * Vectors::FRONT) > 0.0f;
+        if (_isPointTargetValid) {
+            glm::vec3 pointAtBlend = MyAvatar::aimToBlendValues(aimVector, getWorldOrientation());
+            _skeletonModel->getRig().setDirectionalBlending(POINT_BLEND_DIRECTIONAL_ALPHA_NAME, pointAtBlend,
+                POINT_BLEND_LINEAR_ALPHA_NAME, POINT_ALPHA_BLENDING);
+        }
+        return _isPointTargetValid;
+    }
+    return false;
+}
+
+void MyAvatar::resetPointAt() {
+    if (_skeletonModelLoaded) {
+        _skeletonModel->getRig().setDirectionalBlending(POINT_BLEND_DIRECTIONAL_ALPHA_NAME, glm::vec3(),
+                                                        POINT_BLEND_LINEAR_ALPHA_NAME, POINT_ALPHA_BLENDING);
     }
 }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index bb6f036533..6b1344aad2 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -29,10 +29,12 @@
 #include <ScriptEngine.h>
 #include <SettingHandle.h>
 #include <Sound.h>
+#include <shared/Camera.h>
 
 #include "AtRestDetector.h"
 #include "MyCharacterController.h"
 #include "RingBufferHistory.h"
+#include "devices/DdeFaceTracker.h"
 
 class AvatarActionHold;
 class ModelItemID;
@@ -154,6 +156,7 @@ class MyAvatar : public Avatar {
      *
      * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML.
      *
+     * @property {Vec3} feetPosition - The position of the avatar's feet.
      * @property {boolean} shouldRenderLocally=true - If <code>true</code> then your avatar is rendered for you in Interface,
      *     otherwise it is not rendered for you (but it is still rendered for other users).
      * @property {Vec3} motorVelocity=Vec3.ZERO - The target velocity of your avatar to be achieved by a scripted motor.
@@ -340,6 +343,7 @@ class MyAvatar : public Avatar {
     Q_PROPERTY(QVector3D qmlPosition READ getQmlPosition)
     QVector3D getQmlPosition() { auto p = getWorldPosition(); return QVector3D(p.x, p.y, p.z); }
 
+    Q_PROPERTY(glm::vec3 feetPosition READ getWorldFeetPosition WRITE goToFeetLocation)
     Q_PROPERTY(bool shouldRenderLocally READ getShouldRenderLocally WRITE setShouldRenderLocally)
     Q_PROPERTY(glm::vec3 motorVelocity READ getScriptedMotorVelocity WRITE setScriptedMotorVelocity)
     Q_PROPERTY(float motorTimescale READ getScriptedMotorTimescale WRITE setScriptedMotorTimescale)
@@ -1745,6 +1749,34 @@ public:
     glm::vec3 getNextPosition() { return _goToPending ? _goToPosition : getWorldPosition(); }
     void prepareAvatarEntityDataForReload();
 
+    /**jsdoc
+    * Turn the avatar's head until it faces the target point within the 90/-90 degree range.
+    * Once this method is called, API calls will have full control of the head for a limited time.
+    * If this method is not called for two seconds, the engine will regain control of the head.
+    * @function MyAvatar.setHeadLookAt
+    * @param {Vec3} lookAtTarget - The target point in world coordinates.
+    */
+    Q_INVOKABLE void setHeadLookAt(const glm::vec3& lookAtTarget);
+
+    /**jsdoc
+    * Returns the current head look at target point in world coordinates.
+    * @function MyAvatar.getHeadLookAt
+    * @returns {Vec3} Default position between your avatar's eyes in world coordinates.
+    */
+    Q_INVOKABLE glm::vec3 getHeadLookAt() { return _lookAtCameraTarget; }
+
+    /**jsdoc
+    * Aims the pointing directional blending towards the provided target point.
+    * The "point" reaction should be triggered before using this method. 
+    * <code>MyAvatar.beginReaction("point")</code>
+    * Returns <code>true</code> if the target point lays in front of the avatar.
+    * @function MyAvatar.setPointAt
+    * @param {Vec3} pointAtTarget - The target point in world coordinates.
+    */
+    Q_INVOKABLE bool setPointAt(const glm::vec3& pointAtTarget);
+
+    glm::quat getLookAtRotation() { return _lookAtYaw * _lookAtPitch; }
+
     /**jsdoc
      * Creates a new grab that grabs an entity.
      * @function MyAvatar.grab
@@ -1862,6 +1894,8 @@ public:
     bool getFlowActive() const;
     bool getNetworkGraphActive() const;
 
+    void updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera);
+
     // sets the reaction enabled and triggered parameters of the passed in params
     // also clears internal reaction triggers
     void updateRigControllerParameters(Rig::ControllerParameters& params);
@@ -1869,6 +1903,10 @@ public:
     // Don't substitute verify-fail:
     virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; }
 
+    void debugDrawPose(controller::Action action, const char* channelName, float size);
+
+    bool getIsJointOverridden(int jointIndex) const;
+
 public slots:
 
    /**jsdoc
@@ -1938,9 +1976,8 @@ public slots:
      * @param {boolean} [shouldFaceLocation=false] - Set to <code>true</code> to position the avatar a short distance away from
      *      the new position and orientate the avatar to face the position.
      */
-    void goToFeetLocation(const glm::vec3& newPosition,
-        bool hasOrientation, const glm::quat& newOrientation,
-        bool shouldFaceLocation);
+    void goToFeetLocation(const glm::vec3& newPosition, bool hasOrientation = false, 
+        const glm::quat& newOrientation = glm::quat(), bool shouldFaceLocation = false);
 
     /**jsdoc
      * Moves the avatar to a new position and/or orientation in the domain.
@@ -2617,6 +2654,18 @@ private:
 
     glm::vec3 _trackedHeadPosition;
 
+    const float MAX_LOOK_AT_TIME_SCRIPT_CONTROL = 2.0f;
+    glm::quat _lookAtPitch;
+    glm::quat _lookAtYaw;
+    glm::vec3 _lookAtCameraTarget;
+    glm::vec3 _lookAtScriptTarget;
+    bool _headLookAtActive { false };
+    bool _shouldTurnToFaceCamera { false };
+    bool _scriptControlsHeadLookAt { false };
+    float _scriptHeadControlTimer { 0.0f };
+    bool _pointAtActive { false };
+    bool _isPointTargetValid { true };
+
     Setting::Handle<float> _realWorldFieldOfView;
     Setting::Handle<bool> _useAdvancedMovementControls;
     Setting::Handle<bool> _showPlayArea;
@@ -2641,6 +2690,11 @@ private:
     void initHeadBones();
     void initAnimGraph();
     void initFlowFromFST();
+    void updateHeadLookAt(float deltaTime);
+    void resetHeadLookAt();
+    void resetLookAtRotation(const glm::vec3& avatarPosition, const glm::quat& avatarOrientation);
+    void resetPointAt();
+    static glm::vec3 aimToBlendValues(const glm::vec3& aimVector, const glm::quat& frameOrientation);
 
     // Avatar Preferences
     QUrl _fullAvatarURLFromPreferences;
@@ -2902,6 +2956,9 @@ private:
     int _reactionEnabledRefCounts[NUM_AVATAR_BEGIN_END_REACTIONS] { 0, 0, 0 };
 
     mutable std::mutex _reactionLock;
+
+    // used to prevent character from jumping after endSit is called.
+    bool _endSitKeyPressComplete { false };
 };
 
 QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);
diff --git a/interface/src/avatar/MyHead.cpp b/interface/src/avatar/MyHead.cpp
index 9b05a26c76..e5c8b71ea2 100644
--- a/interface/src/avatar/MyHead.cpp
+++ b/interface/src/avatar/MyHead.cpp
@@ -15,7 +15,7 @@
 #include <recording/Deck.h>
 #include <Rig.h>
 #include <trackers/FaceTracker.h>
-#include <trackers/EyeTracker.h>
+#include <FaceshiftConstants.h>
 
 #include "devices/DdeFaceTracker.h"
 #include "Application.h"
@@ -46,18 +46,37 @@ void MyHead::simulate(float deltaTime) {
     auto player = DependencyManager::get<recording::Deck>();
     // Only use face trackers when not playing back a recording.
     if (!player->isPlaying()) {
-        auto faceTracker = qApp->getActiveFaceTracker();
-        const bool hasActualFaceTrackerConnected = faceTracker && !faceTracker->isMuted();
-        _isFaceTrackerConnected = hasActualFaceTrackerConnected || _owningAvatar->getHasScriptedBlendshapes();
-        if (_isFaceTrackerConnected) {
-            if (hasActualFaceTrackerConnected) {
-                _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
-            }
-        }
+        // TODO -- finish removing face-tracker specific code.  To do this, add input channels for
+        // each blendshape-coefficient and update the various json files to relay them in a useful way.
+        // After that, input plugins can be used to drive the avatar's face, and the various "DDE" files
+        // can be ported into the plugin and removed.
+        //
+        // auto faceTracker = qApp->getActiveFaceTracker();
+        // const bool hasActualFaceTrackerConnected = faceTracker && !faceTracker->isMuted();
+        // _isFaceTrackerConnected = hasActualFaceTrackerConnected || _owningAvatar->getHasScriptedBlendshapes();
+        // if (_isFaceTrackerConnected) {
+        //     if (hasActualFaceTrackerConnected) {
+        //         _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
+        //     }
+        // }
 
-        auto eyeTracker = DependencyManager::get<EyeTracker>();
-        _isEyeTrackerConnected = eyeTracker->isTracking();
-        // if eye tracker is connected we should get the data here.
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        bool eyeLidsTracked =
+            userInputMapper->getActionStateValid(controller::Action::LEFT_EYE_BLINK) &&
+            userInputMapper->getActionStateValid(controller::Action::RIGHT_EYE_BLINK);
+        setFaceTrackerConnected(eyeLidsTracked);
+        if (eyeLidsTracked) {
+            float leftEyeBlink = userInputMapper->getActionState(controller::Action::LEFT_EYE_BLINK);
+            float rightEyeBlink = userInputMapper->getActionState(controller::Action::RIGHT_EYE_BLINK);
+            _blendshapeCoefficients.resize(std::max(_blendshapeCoefficients.size(), 2));
+            _blendshapeCoefficients[EYE_BLINK_INDICES[0]] = leftEyeBlink;
+            _blendshapeCoefficients[EYE_BLINK_INDICES[1]] = rightEyeBlink;
+        } else {
+            const float FULLY_OPEN = 0.0f;
+            _blendshapeCoefficients.resize(std::max(_blendshapeCoefficients.size(), 2));
+            _blendshapeCoefficients[EYE_BLINK_INDICES[0]] = FULLY_OPEN;
+            _blendshapeCoefficients[EYE_BLINK_INDICES[1]] = FULLY_OPEN;
+        }
     }
     Parent::simulate(deltaTime);
 }
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 6080911dd9..38065c8095 100755
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -114,13 +114,12 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
 
     Head* head = _owningAvatar->getHead();
 
-    // make sure lookAt is not too close to face (avoid crosseyes)
-    glm::vec3 lookAt = head->getLookAtPosition();
-    glm::vec3 focusOffset = lookAt - _owningAvatar->getHead()->getEyePosition();
-    float focusDistance = glm::length(focusOffset);
-    const float MIN_LOOK_AT_FOCUS_DISTANCE = 1.0f;
-    if (focusDistance < MIN_LOOK_AT_FOCUS_DISTANCE && focusDistance > EPSILON) {
-        lookAt = _owningAvatar->getHead()->getEyePosition() + (MIN_LOOK_AT_FOCUS_DISTANCE / focusDistance) * focusOffset;
+    bool eyePosesValid = !head->getHasProceduralEyeMovement();
+    glm::vec3 lookAt;
+    if (eyePosesValid) {
+        lookAt = head->getLookAtPosition(); // don't apply no-crosseyes code when eyes are being tracked
+    } else {
+        lookAt = avoidCrossedEyes(head->getLookAtPosition());
     }
 
     MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
@@ -313,8 +312,8 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     if (spine2Joint >= 0) {
         params.spine2ShapeInfo = hfmModel.joints[spine2Joint].shapeInfo;
     }
-
-    params.isTalking = head->getTimeWithoutTalking() <= 1.5f;
+    const float TALKING_TIME_THRESHOLD = 0.75f;
+    params.isTalking = head->getTimeWithoutTalking() <= TALKING_TIME_THRESHOLD;
 
     myAvatar->updateRigControllerParameters(params);
 
@@ -337,10 +336,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     eyeParams.modelTranslation = getTranslation();
     eyeParams.leftEyeJointIndex = _rig.indexOfJoint("LeftEye");
     eyeParams.rightEyeJointIndex = _rig.indexOfJoint("RightEye");
-
-    if (_owningAvatar->getHasProceduralEyeFaceMovement()) {
-        _rig.updateFromEyeParameters(eyeParams);
-    }
+    _rig.updateFromEyeParameters(eyeParams);
 
     updateFingers();
 }
diff --git a/interface/src/avatar/OtherAvatar.cpp b/interface/src/avatar/OtherAvatar.cpp
index 8c8c42679b..5673c2443f 100755
--- a/interface/src/avatar/OtherAvatar.cpp
+++ b/interface/src/avatar/OtherAvatar.cpp
@@ -512,13 +512,13 @@ void OtherAvatar::handleChangedAvatarEntityData() {
                 entity->setParentID(NULL_ID);
                 entity->setParentID(oldParentID);
 
-                if (entity->stillHasMyGrabAction()) {
+                if (entity->stillHasMyGrab()) {
                     // For this case: we want to ignore transform+velocities coming from authoritative OtherAvatar
                     // because the MyAvatar is grabbing and we expect the local grab state
                     // to have enough information to prevent simulation drift.
                     //
                     // Clever readers might realize this could cause problems.  For example,
-                    // if an ignored OtherAvagtar were to simultanously grab the object then there would be
+                    // if an ignored OtherAvatar were to simultanously grab the object then there would be
                     // a noticeable discrepancy between participants in the distributed physics simulation,
                     // however the difference would be stable and would not drift.
                     properties.clearTransformOrVelocityChanges();
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index f6ce1ec8ad..9af1d07309 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -14,6 +14,7 @@
 #include <QtCore/QProcess>
 #include <QDebug>
 #include <QDir>
+#include <QFileInfo>
 #include <QLocalSocket>
 #include <QLocalServer>
 #include <QSharedMemory>
@@ -70,7 +71,7 @@ int main(int argc, const char* argv[]) {
     }
 
     QCommandLineParser parser;
-    parser.setApplicationDescription("High Fidelity Interface");
+    parser.setApplicationDescription("High Fidelity");
     QCommandLineOption versionOption = parser.addVersionOption();
     QCommandLineOption helpOption = parser.addHelpOption();
 
@@ -117,21 +118,27 @@ int main(int argc, const char* argv[]) {
     }
 
     QString applicationPath;
+    // A temporary application instance is needed to get the location of the running executable
+    // Tests using high_resolution_clock show that this takes about 30-50 microseconds (on my machine, YMMV)
+    // If we wanted to avoid the QCoreApplication, we would need to write our own
+    // cross-platform implementation.
     {
-        // A temporary application instance is needed to get the location of the running executable
-        // Tests using high_resolution_clock show that this takes about 30-50 microseconds (on my machine, YMMV)
-        // If we wanted to avoid the QCoreApplication, we would need to write our own
-        // cross-platform implementation.
         QCoreApplication tempApp(argc, const_cast<char**>(argv));
+#ifdef Q_OS_OSX
+        if (QFileInfo::exists(QCoreApplication::applicationDirPath() + "/../../../config.json")) {
+            applicationPath = QCoreApplication::applicationDirPath() + "/../../../";
+        } else {
+            applicationPath = QCoreApplication::applicationDirPath();
+        }
+#else
         applicationPath = QCoreApplication::applicationDirPath();
+#endif
     }
-
     static const QString APPLICATION_CONFIG_FILENAME = "config.json";
     QDir applicationDir(applicationPath);
     QString configFileName = applicationDir.filePath(APPLICATION_CONFIG_FILENAME);
     QFile configFile(configFileName);
     QString launcherPath;
-    
     if (configFile.exists()) {
         if (!configFile.open(QIODevice::ReadOnly)) {
             qWarning() << "Found application config, but could not open it";
diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp
index ba392f0cd1..43958188e3 100644
--- a/interface/src/scripting/Audio.cpp
+++ b/interface/src/scripting/Audio.cpp
@@ -440,13 +440,13 @@ void Audio::handlePushedToTalk(bool enabled) {
     }
 }
 
-void Audio::setInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+void Audio::setInputDevice(const HifiAudioDeviceInfo& device, bool isHMD) {
     withWriteLock([&] {
         _devices.chooseInputDevice(device, isHMD);
     });
 }
 
-void Audio::setOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+void Audio::setOutputDevice(const HifiAudioDeviceInfo& device, bool isHMD) {
     withWriteLock([&] {
         _devices.chooseOutputDevice(device, isHMD);
     });
diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h
index d3bc6b9449..74d85f0107 100644
--- a/interface/src/scripting/Audio.h
+++ b/interface/src/scripting/Audio.h
@@ -19,6 +19,7 @@
 #include "SettingHandle.h"
 #include "AudioFileWav.h"
 #include <shared/ReadWriteLockable.h>
+#include <HifiAudioDeviceInfo.h>
 
 using MutedGetter = std::function<bool()>;
 using MutedSetter = std::function<void(bool)>;
@@ -158,7 +159,7 @@ public:
      * @param {boolean} isHMD - Is HMD.
      * @deprecated This function is deprecated and will be removed.
      */
-    Q_INVOKABLE void setInputDevice(const QAudioDeviceInfo& device, bool isHMD);
+    Q_INVOKABLE void setInputDevice(const HifiAudioDeviceInfo& device, bool isHMD);
 
     /**jsdoc
      * @function Audio.setOutputDevice
@@ -166,7 +167,7 @@ public:
      * @param {boolean} isHMD - Is HMD.
      * @deprecated This function is deprecated and will be removed.
      */
-    Q_INVOKABLE void setOutputDevice(const QAudioDeviceInfo& device, bool isHMD);
+    Q_INVOKABLE void setOutputDevice(const HifiAudioDeviceInfo& device, bool isHMD);
 
     /**jsdoc
      * Enables or disables reverberation. Reverberation is done by the client on the post-mix audio. The reverberation options
diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index ce82786c8d..8cc45a3bf5 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -29,6 +29,8 @@ static Setting::Handle<QString> desktopOutputDeviceSetting { QStringList { Audio
 static Setting::Handle<QString> hmdInputDeviceSetting { QStringList { Audio::AUDIO, Audio::HMD, "INPUT" }};
 static Setting::Handle<QString> hmdOutputDeviceSetting { QStringList { Audio::AUDIO, Audio::HMD, "OUTPUT" }};
 
+Q_DECLARE_METATYPE(HifiAudioDeviceInfo);
+
 Setting::Handle<QString>& getSetting(bool contextIsHMD, QAudio::Mode mode) {
     if (mode == QAudio::AudioInput) {
         return contextIsHMD ? hmdInputDeviceSetting : desktopInputDeviceSetting;
@@ -64,6 +66,8 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
         } else { // if (_mode == QAudio::AudioOutput)
             deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
         }
+    } else {
+        deviceName = HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME;
     }
     return deviceName;
 }
@@ -71,32 +75,44 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
 Qt::ItemFlags AudioDeviceList::_flags { Qt::ItemIsSelectable | Qt::ItemIsEnabled };
 
 AudioDeviceList::AudioDeviceList(QAudio::Mode mode) : _mode(mode) {
-    auto& setting1 = getSetting(true, QAudio::AudioInput);
-    if (setting1.isSet()) {
-        qDebug() << "Device name in settings for HMD, Input" << setting1.get();
-    } else {
-        qDebug() << "Device name in settings for HMD, Input not set";
+    if (mode == QAudio::AudioInput) {
+        auto& setting1 = getSetting(true, QAudio::AudioInput);
+        if (setting1.isSet()) {
+            qDebug() << "Device name in settings for HMD, Input" << setting1.get();
+            _backupSelectedHMDDeviceName = setting1.get();
+        } else {
+            qDebug() << "Device name in settings for HMD, Input not set";
+        }
     }
 
-    auto& setting2 = getSetting(true, QAudio::AudioOutput);
-    if (setting2.isSet()) {
-        qDebug() << "Device name in settings for HMD, Output" << setting2.get();
-    } else {
-        qDebug() << "Device name in settings for HMD, Output not set";
+    if (mode == QAudio::AudioOutput) {
+        auto& setting2 = getSetting(true, QAudio::AudioOutput);
+        if (setting2.isSet()) {
+            qDebug() << "Device name in settings for HMD, Output" << setting2.get();
+            _backupSelectedHMDDeviceName = setting2.get();
+        } else {
+            qDebug() << "Device name in settings for HMD, Output not set";
+        }
     }
 
-    auto& setting3 = getSetting(false, QAudio::AudioInput);
-    if (setting3.isSet()) {
-        qDebug() << "Device name in settings for Desktop, Input" << setting3.get();
-    } else {
-        qDebug() << "Device name in settings for Desktop, Input not set";
+    if (mode == QAudio::AudioInput) {
+        auto& setting3 = getSetting(false, QAudio::AudioInput);
+        if (setting3.isSet()) {
+            qDebug() << "Device name in settings for Desktop, Input" << setting3.get();
+            _backupSelectedDesktopDeviceName = setting3.get();
+        } else {
+            qDebug() << "Device name in settings for Desktop, Input not set";
+        }
     }
 
-    auto& setting4 = getSetting(false, QAudio::AudioOutput);
-    if (setting4.isSet()) {
-        qDebug() << "Device name in settings for Desktop, Output" << setting4.get();
-    } else {
-        qDebug() << "Device name in settings for Desktop, Output not set";
+    if (mode == QAudio::AudioOutput) {
+        auto& setting4 = getSetting(false, QAudio::AudioOutput);
+        if (setting4.isSet()) {
+            qDebug() << "Device name in settings for Desktop, Output" << setting4.get();
+            _backupSelectedDesktopDeviceName = setting4.get();
+        } else {
+            qDebug() << "Device name in settings for Desktop, Output not set";
+        }
     }
 }
 
@@ -127,7 +143,7 @@ QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
     } else if (role == SelectedHMDRole) {
         return _devices.at(index.row())->selectedHMD;
     } else if (role == InfoRole) {
-        return QVariant::fromValue<QAudioDeviceInfo>(_devices.at(index.row())->info);
+        return QVariant::fromValue<HifiAudioDeviceInfo>(_devices.at(index.row())->info);
     } else {
         return QVariant();
     }
@@ -179,18 +195,13 @@ void AudioDeviceList::resetDevice(bool contextIsHMD) {
 #endif
 }
 
-void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device, bool isHMD) {
-    QAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+void AudioDeviceList::onDeviceChanged(const HifiAudioDeviceInfo& device, bool isHMD) {
+    HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
     selectedDevice = device;
-
     for (auto i = 0; i < _devices.size(); ++i) {
         std::shared_ptr<AudioDevice> device = _devices[i];
         bool& isSelected = isHMD ? device->selectedHMD : device->selectedDesktop;
-        if (isSelected && device->info != selectedDevice) {
-            isSelected = false;
-        } else if (device->info == selectedDevice) {
-            isSelected = true;
-        }
+        isSelected = device->info == selectedDevice;
     }
 
     emit deviceChanged(selectedDevice);
@@ -247,37 +258,46 @@ std::shared_ptr<scripting::AudioDevice> getSimilarDevice(const QString& deviceNa
     return devices[minDistanceIndex];
 }
 
-void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices) {
+void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices) {
     beginResetModel();
 
     QList<std::shared_ptr<AudioDevice>> newDevices;
     bool hmdIsSelected = false;
     bool desktopIsSelected = false;
 
-    foreach(const QAudioDeviceInfo& deviceInfo, devices) {
+    foreach(const HifiAudioDeviceInfo& deviceInfo, devices) {
         for (bool isHMD : {false, true}) {
             auto& backupSelectedDeviceName = isHMD ? _backupSelectedHMDDeviceName : _backupSelectedDesktopDeviceName;
             if (deviceInfo.deviceName() == backupSelectedDeviceName) {
-                QAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+                HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
                 selectedDevice = deviceInfo;
                 backupSelectedDeviceName.clear();
             }
         }
     }
 
-    foreach(const QAudioDeviceInfo& deviceInfo, devices) {
+    foreach(const HifiAudioDeviceInfo& deviceInfo, devices) {
         AudioDevice device;
         device.info = deviceInfo;
-        device.display = device.info.deviceName()
-            .replace("High Definition", "HD")
-            .remove("Device")
-            .replace(" )", ")");
+
+        if (deviceInfo.isDefault()) {
+            if (deviceInfo.getMode() == QAudio::AudioInput) {
+                device.display = "Computer's default microphone (recommended)";
+            } else {
+                device.display = "Computer's default audio (recommended)";
+            }
+        } else {
+            device.display = device.info.deviceName()
+                .replace("High Definition", "HD")
+                .remove("Device")
+                .replace(" )", ")");
+        }
 
         for (bool isHMD : {false, true}) {
-            QAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+            HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
             bool& isSelected = isHMD ? device.selectedHMD : device.selectedDesktop;
 
-            if (!selectedDevice.isNull()) {
+            if (!selectedDevice.getDevice().isNull()) {
                 isSelected = (device.info == selectedDevice);
             }
             else {
@@ -313,13 +333,13 @@ void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices) {
 
     if (!newDevices.isEmpty()) {
         if (!hmdIsSelected) {
-            _backupSelectedHMDDeviceName = !_selectedHMDDevice.isNull() ? _selectedHMDDevice.deviceName() : _hmdSavedDeviceName;
+            _backupSelectedHMDDeviceName = !_selectedHMDDevice.getDevice().isNull() ? _selectedHMDDevice.deviceName() : _hmdSavedDeviceName;
             auto device = getSimilarDevice(_backupSelectedHMDDeviceName, newDevices);
             device->selectedHMD = true;
             emit selectedDevicePlugged(device->info, true);
         }
         if (!desktopIsSelected) {
-            _backupSelectedDesktopDeviceName = !_selectedDesktopDevice.isNull() ? _selectedDesktopDevice.deviceName() : _desktopSavedDeviceName;
+            _backupSelectedDesktopDeviceName = !_selectedDesktopDevice.getDevice().isNull() ? _selectedDesktopDevice.deviceName() : _desktopSavedDeviceName;
             auto device = getSimilarDevice(_backupSelectedDesktopDeviceName, newDevices);
             device->selectedDesktop = true;
             emit selectedDevicePlugged(device->info, false);
@@ -370,8 +390,8 @@ AudioDevices::AudioDevices(bool& contextIsHMD) : _contextIsHMD(contextIsHMD) {
     _outputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioOutput), contextIsHMD);
 
     // connections are made after client is initialized, so we must also fetch the devices
-    const QList<QAudioDeviceInfo>& devicesInput = client->getAudioDevices(QAudio::AudioInput);
-    const QList<QAudioDeviceInfo>& devicesOutput = client->getAudioDevices(QAudio::AudioOutput);
+    const QList<HifiAudioDeviceInfo>& devicesInput = client->getAudioDevices(QAudio::AudioInput);
+    const QList<HifiAudioDeviceInfo>& devicesOutput = client->getAudioDevices(QAudio::AudioOutput);
 
     //setup devices
     _inputs.onDevicesChanged(devicesInput);
@@ -385,9 +405,9 @@ void AudioDevices::onContextChanged(const QString& context) {
     _outputs.resetDevice(_contextIsHMD);
 }
 
-void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& device,
-                                    const QAudioDeviceInfo& previousDevice, bool isHMD) {
-    QString deviceName = device.isNull() ? QString() : device.deviceName();
+void AudioDevices::onDeviceSelected(QAudio::Mode mode, const HifiAudioDeviceInfo& device,
+                                    const HifiAudioDeviceInfo& previousDevice, bool isHMD) {
+    QString deviceName = device.deviceName();
 
     auto& setting = getSetting(isHMD, mode);
 
@@ -398,7 +418,7 @@ void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& d
     setting.set(deviceName);
 
     // log the selected device
-    if (!device.isNull()) {
+    if (!device.getDevice().isNull()) {
         QJsonObject data;
 
         const QString MODE = "audio_mode";
@@ -422,13 +442,13 @@ void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& d
     }
 }
 
-void AudioDevices::onDeviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device) {
+void AudioDevices::onDeviceChanged(QAudio::Mode mode, const HifiAudioDeviceInfo& device) {
     if (mode == QAudio::AudioInput) {
         if (_requestedInputDevice == device) {
             onDeviceSelected(QAudio::AudioInput, device,
                              _contextIsHMD ? _inputs._selectedHMDDevice : _inputs._selectedDesktopDevice,
                              _contextIsHMD);
-            _requestedInputDevice = QAudioDeviceInfo();
+            _requestedInputDevice = HifiAudioDeviceInfo();
         }
         _inputs.onDeviceChanged(device, _contextIsHMD);
     } else { // if (mode == QAudio::AudioOutput)
@@ -436,13 +456,13 @@ void AudioDevices::onDeviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& de
             onDeviceSelected(QAudio::AudioOutput, device,
                              _contextIsHMD ? _outputs._selectedHMDDevice : _outputs._selectedDesktopDevice,
                              _contextIsHMD);
-            _requestedOutputDevice = QAudioDeviceInfo();
+            _requestedOutputDevice = HifiAudioDeviceInfo();
         }
         _outputs.onDeviceChanged(device, _contextIsHMD);
     }
 }
 
-void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices) {
+void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<HifiAudioDeviceInfo>& devices) {
     static std::once_flag once;
     std::call_once(once, [&] {
         //readout settings
@@ -491,14 +511,14 @@ void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceI
 }
 
 
-void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+void AudioDevices::chooseInputDevice(const HifiAudioDeviceInfo& device, bool isHMD) {
     //check if current context equals device to change
     if (_contextIsHMD == isHMD) {
         auto client = DependencyManager::get<AudioClient>().data();
         _requestedInputDevice = device;
         QMetaObject::invokeMethod(client, "switchAudioDevice",
                                   Q_ARG(QAudio::Mode, QAudio::AudioInput),
-                                  Q_ARG(const QAudioDeviceInfo&, device));
+                                  Q_ARG(const HifiAudioDeviceInfo&, device));
     } else {
         //context is different. just save device in settings
         onDeviceSelected(QAudio::AudioInput, device,
@@ -508,14 +528,14 @@ void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD)
     }
 }
 
-void AudioDevices::chooseOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+void AudioDevices::chooseOutputDevice(const HifiAudioDeviceInfo& device, bool isHMD) {
     //check if current context equals device to change
     if (_contextIsHMD == isHMD) {
         auto client = DependencyManager::get<AudioClient>().data();
         _requestedOutputDevice = device;
         QMetaObject::invokeMethod(client, "switchAudioDevice",
                                   Q_ARG(QAudio::Mode, QAudio::AudioOutput),
-                                  Q_ARG(const QAudioDeviceInfo&, device));
+                                  Q_ARG(const HifiAudioDeviceInfo&, device));
     } else {
         //context is different. just save device in settings
         onDeviceSelected(QAudio::AudioOutput, device,
diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index 2ea034d9fe..13d97d53dd 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -19,11 +19,13 @@
 #include <QAbstractListModel>
 #include <QAudioDeviceInfo>
 
+#include <HifiAudioDeviceInfo.h>
+
 namespace scripting {
 
 class AudioDevice {
 public:
-    QAudioDeviceInfo info;
+    HifiAudioDeviceInfo info;
     QString display;
     bool selectedDesktop { false };
     bool selectedHMD { false };
@@ -50,12 +52,12 @@ public:
     void resetDevice(bool contextIsHMD);
 
 signals:
-    void deviceChanged(const QAudioDeviceInfo& device);
-    void selectedDevicePlugged(const QAudioDeviceInfo& device, bool isHMD);
+    void deviceChanged(const HifiAudioDeviceInfo& device);
+    void selectedDevicePlugged(const HifiAudioDeviceInfo& device, bool isHMD);
 
 protected slots:
-    void onDeviceChanged(const QAudioDeviceInfo& device, bool isHMD);
-    void onDevicesChanged(const QList<QAudioDeviceInfo>& devices);
+    void onDeviceChanged(const HifiAudioDeviceInfo& device, bool isHMD);
+    void onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices);
 
 protected:
     friend class AudioDevices;
@@ -63,8 +65,8 @@ protected:
     static QHash<int, QByteArray> _roles;
     static Qt::ItemFlags _flags;
     const QAudio::Mode _mode;
-    QAudioDeviceInfo _selectedDesktopDevice;
-    QAudioDeviceInfo _selectedHMDDevice;
+    HifiAudioDeviceInfo _selectedDesktopDevice;
+    HifiAudioDeviceInfo _selectedHMDDevice;
     QString _backupSelectedDesktopDeviceName;
     QString _backupSelectedHMDDeviceName;
     QList<std::shared_ptr<AudioDevice>> _devices;
@@ -124,14 +126,14 @@ signals:
     void nop();
 
 private slots:
-    void chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD);
-    void chooseOutputDevice(const QAudioDeviceInfo& device, bool isHMD);
+    void chooseInputDevice(const HifiAudioDeviceInfo& device, bool isHMD);
+    void chooseOutputDevice(const HifiAudioDeviceInfo& device, bool isHMD);
 
     void onContextChanged(const QString& context);
-    void onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& device,
-                          const QAudioDeviceInfo& previousDevice, bool isHMD);
-    void onDeviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device);
-    void onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices);
+    void onDeviceSelected(QAudio::Mode mode, const HifiAudioDeviceInfo& device,
+                          const HifiAudioDeviceInfo& previousDevice, bool isHMD);
+    void onDeviceChanged(QAudio::Mode mode, const HifiAudioDeviceInfo& device);
+    void onDevicesChanged(QAudio::Mode mode, const QList<HifiAudioDeviceInfo>& devices);
 
 private:
     friend class Audio;
@@ -141,8 +143,8 @@ private:
 
     AudioInputDeviceList _inputs;
     AudioDeviceList _outputs { QAudio::AudioOutput };
-    QAudioDeviceInfo _requestedOutputDevice;
-    QAudioDeviceInfo _requestedInputDevice;
+    HifiAudioDeviceInfo _requestedOutputDevice;
+    HifiAudioDeviceInfo _requestedInputDevice;
 
     const bool& _contextIsHMD;
 };
diff --git a/interface/src/scripting/DesktopScriptingInterface.cpp b/interface/src/scripting/DesktopScriptingInterface.cpp
index a1c8e4fc6c..874b3fa42d 100644
--- a/interface/src/scripting/DesktopScriptingInterface.cpp
+++ b/interface/src/scripting/DesktopScriptingInterface.cpp
@@ -52,6 +52,9 @@ static const QVariantMap DOCK_AREA {
     { "RIGHT", DockArea::RIGHT }
 };
 
+DesktopScriptingInterface::DesktopScriptingInterface(QObject* parent, bool restricted) 
+    : QObject(parent), _restricted(restricted) { }
+
 int DesktopScriptingInterface::getWidth() {
     QSize size = qApp->getWindow()->windowHandle()->screen()->virtualSize();
     return size.width();
@@ -128,7 +131,7 @@ InteractiveWindowPointer DesktopScriptingInterface::createWindow(const QString&
         return nullptr;
     }
 
-    return new InteractiveWindow(sourceUrl, properties);
+    return new InteractiveWindow(sourceUrl, properties, _restricted);
 }
 
 InteractiveWindowPointer DesktopScriptingInterface::createWindowOnThread(const QString& sourceUrl, const QVariantMap& properties, QThread* targetThread) {
@@ -139,7 +142,7 @@ InteractiveWindowPointer DesktopScriptingInterface::createWindowOnThread(const Q
     if (!urlValidator(sourceUrl)) {
         return nullptr;
     }
-    InteractiveWindowPointer window = new InteractiveWindow(sourceUrl, properties);
+    InteractiveWindowPointer window = new InteractiveWindow(sourceUrl, properties, _restricted);
     window->moveToThread(targetThread);
     return window;
 }
diff --git a/interface/src/scripting/DesktopScriptingInterface.h b/interface/src/scripting/DesktopScriptingInterface.h
index 525fd7c803..e562a32543 100644
--- a/interface/src/scripting/DesktopScriptingInterface.h
+++ b/interface/src/scripting/DesktopScriptingInterface.h
@@ -54,6 +54,8 @@ class DesktopScriptingInterface : public QObject, public Dependency {
     Q_PROPERTY(int CLOSE_BUTTON_HIDES READ flagCloseButtonHides CONSTANT FINAL)
 
 public:
+    DesktopScriptingInterface(QObject* parent= nullptr, bool restricted = false);
+
     /**jsdoc
      * Sets the opacity of the HUD surface.
      * @function Desktop.setHUDAlpha
@@ -106,6 +108,7 @@ private:
     static QVariantMap getDockArea();
 
     Q_INVOKABLE static QVariantMap getPresentationMode();
+    const bool _restricted;
 };
 
 
diff --git a/interface/src/scripting/SettingsScriptingInterface.cpp b/interface/src/scripting/SettingsScriptingInterface.cpp
index c47d8e1da1..13eddddb1f 100644
--- a/interface/src/scripting/SettingsScriptingInterface.cpp
+++ b/interface/src/scripting/SettingsScriptingInterface.cpp
@@ -38,6 +38,14 @@ void SettingsScriptingInterface::setValue(const QString& setting, const QVariant
     if (getValue(setting) == value) {
         return;
     }
+    if (setting.startsWith("private/")) {
+        if (_restrictPrivateValues) {
+            qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;
+            return;
+        } else {
+            qInfo() << "SettingsScriptingInterface::setValue -- allowing restricted write: " << setting << value;
+        }
+    }
     // Make a deep-copy of the string.
     // Dangling pointers can occur with QStrings that are implicitly shared from a QScriptEngine.
     QString deepCopy = QString::fromUtf16(setting.utf16());
diff --git a/interface/src/scripting/SettingsScriptingInterface.h b/interface/src/scripting/SettingsScriptingInterface.h
index ff00299fd0..f321c41e76 100644
--- a/interface/src/scripting/SettingsScriptingInterface.h
+++ b/interface/src/scripting/SettingsScriptingInterface.h
@@ -27,7 +27,6 @@
 
 class SettingsScriptingInterface : public QObject {
     Q_OBJECT
-    SettingsScriptingInterface() { };
 public:
     static SettingsScriptingInterface* getInstance();
 
@@ -67,6 +66,16 @@ public slots:
 
 signals:
     void valueChanged(const QString& setting, const QVariant& value);
+
+protected:
+    SettingsScriptingInterface(QObject* parent = nullptr) : QObject(parent) { };
+    bool _restrictPrivateValues { true };
+};
+
+class QMLSettingsScriptingInterface : public SettingsScriptingInterface {
+    Q_OBJECT
+public:
+    QMLSettingsScriptingInterface(QObject* parent) : SettingsScriptingInterface(parent) { _restrictPrivateValues = false; }
 };
 
 #endif // hifi_SettingsScriptingInterface_h
diff --git a/interface/src/ui/AnimStats.cpp b/interface/src/ui/AnimStats.cpp
index 47116ea281..2a355e48d1 100644
--- a/interface/src/ui/AnimStats.cpp
+++ b/interface/src/ui/AnimStats.cpp
@@ -118,7 +118,7 @@ void AnimStats::updateStats(bool force) {
 
         auto prevIter = _prevDebugAlphaMap.find(key);
         if (prevIter != _prevDebugAlphaMap.end()) {
-            float prevAlpha = std::get<0>(iter.second);
+            float prevAlpha = std::get<0>(prevIter->second);
             if (prevAlpha != alpha) {
                 // change detected: reset timer
                 _animAlphaValueChangedTimers[key] = now;
diff --git a/interface/src/ui/InteractiveWindow.cpp b/interface/src/ui/InteractiveWindow.cpp
index 9145b12d30..e63c392a47 100644
--- a/interface/src/ui/InteractiveWindow.cpp
+++ b/interface/src/ui/InteractiveWindow.cpp
@@ -18,6 +18,9 @@
 #include <QtQuick/QQuickWindow>
 #include <QQuickView>
 
+#include <ui/types/ContextAwareProfile.h>
+#include <ui/types/HFWebEngineProfile.h>
+#include <ui/types/FileTypeProfile.h>
 #include <DependencyManager.h>
 #include <DockWidget.h>
 #include <RegisteredMetaTypes.h>
@@ -134,7 +137,7 @@ void InteractiveWindow::emitMainWindowResizeEvent() {
  *     Set at window creation. Possible flag values are provided as {@link Desktop|Desktop.ALWAYS_ON_TOP} and {@link Desktop|Desktop.CLOSE_BUTTON_HIDES}.
  *     Additional flag values can be found on Qt's website at https://doc.qt.io/qt-5/qt.html#WindowType-enum.
  */
-InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap& properties) {
+InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap& properties, bool restricted) {
     InteractiveWindowPresentationMode presentationMode = InteractiveWindowPresentationMode::Native;
 
     if (properties.contains(PRESENTATION_MODE_PROPERTY)) {
@@ -228,9 +231,16 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap
         _dockWidget->setObjectName("DockedWidget");
         mainWindow->addDockWidget(dockArea, _dockWidget.get());
     } else {
-        auto offscreenUi = DependencyManager::get<OffscreenUi>();
-        // Build the event bridge and wrapper on the main thread
-        offscreenUi->loadInNewContext(CONTENT_WINDOW_QML, [&](QQmlContext* context, QObject* object) {
+        auto contextInitLambda = [&](QQmlContext* context) {
+            // If the restricted flag is on, the web content will not be able to access local files
+            ContextAwareProfile::restrictContext(context, restricted);
+#if !defined(Q_OS_ANDROID)
+            FileTypeProfile::registerWithContext(context);
+            HFWebEngineProfile::registerWithContext(context);
+#endif
+        };
+
+        auto objectInitLambda = [&](QQmlContext* context, QObject* object) {
             _qmlWindowProxy = std::shared_ptr<QmlWindowProxy>(new QmlWindowProxy(object, nullptr), qmlWindowProxyDeleter);
             context->setContextProperty(EVENT_BRIDGE_PROPERTY, _interactiveWindowProxy.get());
             if (properties.contains(ADDITIONAL_FLAGS_PROPERTY)) {
@@ -286,7 +296,11 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap
             }
             object->setObjectName("InteractiveWindow");
             object->setProperty(SOURCE_PROPERTY, sourceURL);
-        });
+        };
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+
+        // Build the event bridge and wrapper on the main thread
+        offscreenUi->loadInNewContext(CONTENT_WINDOW_QML, objectInitLambda, contextInitLambda);
     }
 }
 
diff --git a/interface/src/ui/InteractiveWindow.h b/interface/src/ui/InteractiveWindow.h
index cc7536af85..70077a27b0 100644
--- a/interface/src/ui/InteractiveWindow.h
+++ b/interface/src/ui/InteractiveWindow.h
@@ -126,7 +126,7 @@ class InteractiveWindow : public QObject {
     Q_PROPERTY(int presentationMode READ getPresentationMode WRITE setPresentationMode)
 
 public:
-    InteractiveWindow(const QString& sourceUrl, const QVariantMap& properties);
+    InteractiveWindow(const QString& sourceUrl, const QVariantMap& properties, bool restricted);
     ~InteractiveWindow();
 
 private:
diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt
index fa4c9d5f45..48ae0485b5 100644
--- a/launchers/darwin/CMakeLists.txt
+++ b/launchers/darwin/CMakeLists.txt
@@ -45,6 +45,8 @@ set(src_files
   src/CustomUI.m
   src/NSTask+NSTaskExecveAdditions.h
   src/NSTask+NSTaskExecveAdditions.m
+  src/HQDefaults.h
+  src/HQDefaults.m
   src/main.mm
   nib/Window.xib
   nib/SplashScreen.xib
@@ -118,9 +120,16 @@ add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
   ${CMAKE_SOURCE_DIR}/images "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources/")
 
+add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy
+  ${CMAKE_SOURCE_DIR}/data/HQDefaults.plist "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources/")
+
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND updater
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/updater" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources/")
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/updater" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/MacOS/"
+  # Older versions of Launcher put updater in `/Contents/Resources/updater`.
+  COMMAND ${CMAKE_COMMAND} -E chdir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources" ln -sf ../MacOS/updater updater
+)
 
 install(
   TARGETS HQLauncher
@@ -146,3 +155,17 @@ set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc"
 
 set(CPACK_GENERATOR "DragNDrop")
 include(CPack)
+
+include(FindXCTest)
+
+include_directories(${CMAKE_SOURCE_DIR}/src)
+
+xctest_add_bundle(HQLauncherTests HQLauncher
+    ${CMAKE_SOURCE_DIR}/src/HQDefaults.m
+    ${CMAKE_SOURCE_DIR}/tests/HQDefaultsTests.m
+    ${CMAKE_SOURCE_DIR}/tests/Info.plist
+)
+
+set_target_properties(HQLauncherTests PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/tests/Info.plist
+  )
diff --git a/launchers/darwin/HQ Launcher.entitlements b/launchers/darwin/HQ Launcher.entitlements
new file mode 100644
index 0000000000..ddfcefe3af
--- /dev/null
+++ b/launchers/darwin/HQ Launcher.entitlements	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>high-fidelity.hifi</string>
+	</array>
+</dict>
+</plist>
diff --git a/launchers/darwin/data/HQDefaults.plist b/launchers/darwin/data/HQDefaults.plist
new file mode 100644
index 0000000000..98a29664c9
--- /dev/null
+++ b/launchers/darwin/data/HQDefaults.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <array>
+        <dict>
+            <key>name</key>
+            <string>thunderURL</string>
+            <key>defaultValue</key>
+            <string>https://thunder.highfidelity.com</string>
+            <key>environmentVariable</key>
+            <string>HIFI_THUNDER_URL</string>
+        </dict>
+    </array>
+</plist>
diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib
index 9862c3773b..77cc3b2222 100644
--- a/launchers/darwin/nib/DisplayNameScreen.xib
+++ b/launchers/darwin/nib/DisplayNameScreen.xib
@@ -81,7 +81,7 @@
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xeX-qc-ccB" customClass="HFButton">
                     <rect key="frame" x="205" y="111" width="104" height="42"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" title="LOG IN" bezelStyle="shadowlessSquare" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6Ba-S9-5qW">
+                    <buttonCell key="cell" type="square" title="NEXT" bezelStyle="shadowlessSquare" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6Ba-S9-5qW">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="systemBold" size="18"/>
                     </buttonCell>
diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib
index 3ae91632c2..0a6d947f8d 100644
--- a/launchers/darwin/nib/LoginScreen.xib
+++ b/launchers/darwin/nib/LoginScreen.xib
@@ -76,7 +76,7 @@
                 <button focusRingType="exterior" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jKE-fV-Tjv" customClass="HFButton">
                     <rect key="frame" x="197" y="57" width="110" height="35"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" title="NEXT" bezelStyle="shadowlessSquare" alignment="center" state="on" borderStyle="border" focusRingType="exterior" imageScaling="proportionallyUpOrDown" inset="2" id="RZM-vz-5eS">
+                    <buttonCell key="cell" type="square" title="LOG IN" bezelStyle="shadowlessSquare" alignment="center" state="on" borderStyle="border" focusRingType="exterior" imageScaling="proportionallyUpOrDown" inset="2" id="RZM-vz-5eS">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="systemBold" size="18"/>
                     </buttonCell>
diff --git a/launchers/darwin/src/DownloadInterface.m b/launchers/darwin/src/DownloadInterface.m
index 09599d05c4..40c5e328de 100644
--- a/launchers/darwin/src/DownloadInterface.m
+++ b/launchers/darwin/src/DownloadInterface.m
@@ -50,6 +50,8 @@
                                                      repeats: YES];
     NSError *error = nil;
     NSFileManager *fileManager = [NSFileManager defaultManager];
+    Launcher* sharedLauncher = [Launcher sharedLauncher];
+    NSString* appPath = [sharedLauncher getAppPath];
     NSString *destinationFileName = downloadTask.originalRequest.URL.lastPathComponent;
     NSString* finalFilePath = [[[Launcher sharedLauncher] getAppPath] stringByAppendingPathComponent:destinationFileName];
     NSURL *destinationURL = [NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]] relativeToURL: [NSURL URLWithString:@"file://"]];
@@ -59,7 +61,12 @@
     }
     [fileManager moveItemAtURL:location toURL:destinationURL error:&error];
 
-    Launcher* sharedLauncher = [Launcher sharedLauncher];
+    NSURL *oldInterfaceURL = [NSURL URLWithString: [[appPath stringByAppendingString:@"interface.app"] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]] relativeToURL: [NSURL URLWithString:@"file://"]];
+
+    if([fileManager fileExistsAtPath:[oldInterfaceURL path]])
+    {
+        [fileManager removeItemAtURL:oldInterfaceURL error:nil];
+    }
 
     if (error) {
         NSLog(@"Download Interface: failed to move file to destination -> error: %@", error);
@@ -68,7 +75,6 @@
         return;
     }
     [sharedLauncher setDownloadFilename:destinationFileName];
-    NSString* appPath = [sharedLauncher getAppPath];
     NSString* downloadFileName = [sharedLauncher getDownloadFilename];
 
     NSLog(@"extract interface zip");
diff --git a/launchers/darwin/src/DownloadLauncher.h b/launchers/darwin/src/DownloadLauncher.h
index 2f97910cd8..c1aeae4a5a 100644
--- a/launchers/darwin/src/DownloadLauncher.h
+++ b/launchers/darwin/src/DownloadLauncher.h
@@ -3,6 +3,8 @@
 @interface DownloadLauncher :  NSObject<NSURLSessionDataDelegate, NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLDownloadDelegate> {
 }
 
+@property (readonly) bool didBecomeDownloadTask;
+
 - (void) downloadLauncher:(NSString*) launcherUrl;
 
 @end
diff --git a/launchers/darwin/src/DownloadLauncher.m b/launchers/darwin/src/DownloadLauncher.m
index 7c32cf7d90..0811779db8 100644
--- a/launchers/darwin/src/DownloadLauncher.m
+++ b/launchers/darwin/src/DownloadLauncher.m
@@ -1,9 +1,20 @@
 #import "DownloadLauncher.h"
 #import "Launcher.h"
 
+#include <sys/stat.h>
+
+static const __int32_t kMinLauncherSize = 250000;  // 308kb is our smallest launcher
+static const NSString *kIOError = @"IOError";
 
 @implementation DownloadLauncher
 
+-(id)init {
+    if ((self = [super init]) != nil) {
+        _didBecomeDownloadTask = false;
+    }
+    return self;
+}
+
 - (void) downloadLauncher:(NSString*)launcherUrl {
     NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:launcherUrl]
                                                            cachePolicy:NSURLRequestUseProtocolCachePolicy
@@ -12,8 +23,8 @@
 
     NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
     NSURLSession *defaultSession = [NSURLSession sessionWithConfiguration: defaultConfigObject delegate: self delegateQueue: [NSOperationQueue mainQueue]];
-    NSURLSessionDownloadTask *downloadTask = [defaultSession downloadTaskWithRequest:request];
-    [downloadTask resume];
+    NSURLSessionDataTask *task = [defaultSession dataTaskWithRequest:request];
+    [task resume];
 }
 
 -(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite {
@@ -22,8 +33,57 @@
 
 }
 
+-(void)validateHQLauncherZipAt:(NSURL *)location {
+    // Does the file look like a valid HQLauncher ZIP?
+    struct stat lStat;
+    const char *cStrLocation = location.fileSystemRepresentation;
+    if (stat(cStrLocation, &lStat) != 0) {
+        NSLog(@"couldn't stat download file: %s", cStrLocation);
+        @throw [NSException exceptionWithName:(NSString *)kIOError
+                                       reason:@"couldn't stat download file"
+                                     userInfo:nil];
+    }
+    if (lStat.st_size <= kMinLauncherSize) {
+        NSLog(@"download is too small: %s is %lld bytes, should be at least %d bytes",
+              cStrLocation, lStat.st_size, kMinLauncherSize);
+        @throw [NSException exceptionWithName:(NSString *)kIOError
+                                       reason:@"download is too small"
+                                     userInfo:nil];
+    }
+}
+
+-(void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask
+                                didReceiveResponse:(NSURLResponse *)response
+                                 completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
+{
+    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
+    NSURLSessionResponseDisposition disposition = NSURLSessionResponseBecomeDownload;
+    if (httpResponse.statusCode != 200) {
+        NSLog(@"expected statusCode 200, got %ld", (long)httpResponse.statusCode);
+        disposition = NSURLSessionResponseCancel;
+    }
+    completionHandler(disposition);
+}
+
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask
+                              didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
+{
+    _didBecomeDownloadTask = true;
+}
+
 -(void)URLSession:(NSURLSession*)session downloadTask:(NSURLSessionDownloadTask*)downloadTask didFinishDownloadingToURL:(NSURL*)location {
     NSLog(@"Did finish downloading to url");
+    @try {
+        [self validateHQLauncherZipAt:location];
+    }
+    @catch (NSException *exc) {
+        if ([exc.name isEqualToString:(NSString *)kIOError]) {
+            [[Launcher sharedLauncher] displayErrorPage];
+            return;
+        }
+        @throw;
+    }
+
      NSError* error = nil;
     NSFileManager* fileManager = [NSFileManager defaultManager];
     NSString* destinationFileName = downloadTask.originalRequest.URL.lastPathComponent;
@@ -61,9 +121,14 @@
 }
 
 - (void)URLSession:(NSURLSession*)session task:(NSURLSessionTask*)task didCompleteWithError:(NSError*)error {
-    NSLog(@"completed; error: %@", error);
     if (error) {
+        if (_didBecomeDownloadTask && [task class] == [NSURLSessionDataTask class]) {
+            return;
+        }
+        NSLog(@"couldn't complete download: %@", error);
         [[Launcher sharedLauncher] displayErrorPage];
+    } else {
+        NSLog(@"finished downloading Launcher");
     }
 }
 @end
diff --git a/launchers/darwin/src/HQDefaults.h b/launchers/darwin/src/HQDefaults.h
new file mode 100644
index 0000000000..631a672ddf
--- /dev/null
+++ b/launchers/darwin/src/HQDefaults.h
@@ -0,0 +1,46 @@
+//
+//  Created by Matt Hardcastle <m@hardcastle.com>
+//  Copyright 2018 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
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*
+ * `HQDefaults` loads defaults from the `HQDefaults.plist` and allows
+ * defaults in that plist to be overwritten using an environment variable.
+ *
+ * For example, the following `HQDefaults.plist` will set a default "foo"
+ * with a value "bar". The "bar" value can be overwritten with the value of
+ * the FOO environment variables, if the FOO environment variable is set.
+ *
+ * <?xml version="1.0" encoding="UTF-8"?>
+ * <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ * <plist version="1.0">
+ *     <array>
+ *         <dict>
+ *             <key>name</key>
+ *             <string>foo</string>
+ *             <key>defaultValue</key>
+ *             <string>bar</string>
+ *             <key>environmentVariable</key>
+ *             <string>FOO</string>
+ *         </dict>
+ *     </array>
+ * </plist>
+ */
+
+@interface HQDefaults : NSObject
+
+-(NSString *)defaultNamed:(NSString *)name;
++(HQDefaults *)sharedDefaults;
+
+@property (strong, readonly) NSDictionary<NSString *, NSString *> *defaults;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/launchers/darwin/src/HQDefaults.m b/launchers/darwin/src/HQDefaults.m
new file mode 100644
index 0000000000..5795b05554
--- /dev/null
+++ b/launchers/darwin/src/HQDefaults.m
@@ -0,0 +1,74 @@
+//
+//  Created by Matt Hardcastle <m@hardcastle.com>
+//  Copyright 2018 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
+//
+
+#import "HQDefaults.h"
+
+@implementation HQDefaults;
+
+// This initializer is for testing purposes. See `init()` for normal use.
+-(id)initWithArray:(NSArray *)array environment:(NSDictionary<NSString *, NSString *> *)environment
+{
+    self = [super init];
+    if (self) {
+        NSMutableDictionary<NSString *, NSString *> *__defaults = [[NSMutableDictionary alloc] init];
+        NSString *name, *defaultValue, *environmentVariable;
+
+        for (NSDictionary *obj in array) {
+            NSMutableArray<NSString *> *missingKeys = [[NSMutableArray alloc] init];
+            if ((name = [obj objectForKey:@"name"]) == nil) {
+                [missingKeys addObject:@"name"];
+            }
+            if ((defaultValue = [obj objectForKey:@"defaultValue"]) == nil) {
+                [missingKeys addObject:@"defaultValue"];
+            }
+            if ([missingKeys count] > 0) {
+                @throw [NSException exceptionWithName:@"InvalidHQDefaults"
+                                               reason:@"A required key is missing"
+                                             userInfo:@{@"missingKeys": missingKeys}];
+            }
+
+            environmentVariable = [obj objectForKey:@"environmentVariable"];
+            if (environmentVariable == nil) {
+                __defaults[name] = defaultValue;
+                continue;
+            }
+
+            NSString *value = environment[environmentVariable];
+            __defaults[name] = value == nil ? defaultValue : value;
+        }
+
+        // Make the dictionary immutable.
+        _defaults = __defaults;
+    }
+    return self;
+}
+
+// Initialize an `HQLauncher` object using the bundles "HQDefaults.plist" and the current process's environment.
+-(id)init {
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSString *defaultsPath = [bundle pathForResource:@"HQDefaults" ofType:@"plist"];
+    NSArray *array = [NSArray arrayWithContentsOfFile:defaultsPath];
+    return [self initWithArray:array environment:NSProcessInfo.processInfo.environment];
+}
+
+// Retrieve a default.
+-(NSString *)defaultNamed:(NSString *)name {
+    return _defaults[name];
+}
+
+// A singleton HQDefaults using the mainBundle's "HQDefaults.plist" and the environment.
++(HQDefaults *)sharedDefaults {
+    static HQDefaults *defaults = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        defaults = [[HQDefaults alloc] init];
+    });
+    return defaults;
+}
+
+@end
diff --git a/launchers/darwin/src/LatestBuildRequest.m b/launchers/darwin/src/LatestBuildRequest.m
index 45ed4418ad..729aa9ef7e 100644
--- a/launchers/darwin/src/LatestBuildRequest.m
+++ b/launchers/darwin/src/LatestBuildRequest.m
@@ -1,6 +1,7 @@
 #import "LatestBuildRequest.h"
 #import "Launcher.h"
 #import "Settings.h"
+#import "HQDefaults.h"
 
 @implementation LatestBuildRequest
 
@@ -8,7 +9,13 @@
     NSString* buildsURL = [[[NSProcessInfo processInfo] environment] objectForKey:@"HQ_LAUNCHER_BUILDS_URL"];
 
     if ([buildsURL length] == 0) {
-        buildsURL = @"https://thunder.highfidelity.com/builds/api/tags/latest?format=json";
+        NSString *thunderURL = [[HQDefaults sharedDefaults] defaultNamed:@"thunderURL"];
+        if (thunderURL == nil) {
+            @throw [NSException exceptionWithName:@"DefaultMissing"
+                                           reason:@"The thunderURL default is missing"
+                                         userInfo:nil];
+        }
+        buildsURL = [NSString stringWithFormat:@"%@/builds/api/tags/latest?format=json", thunderURL];
     }
 
     NSLog(@"Making request for builds to: %@", buildsURL);
@@ -19,9 +26,8 @@
     [request setValue:@USER_AGENT_STRING forHTTPHeaderField:@"User-Agent"];
     [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
 
-    // We're using an ephermeral session here to ensure the tags api response is never cached.
-    NSURLSession* session = [NSURLSession sessionWithConfiguration:NSURLSessionConfiguration.ephemeralSessionConfiguration];
-    NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+    request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
+    NSURLSessionDataTask* dataTask = [NSURLSession.sharedSession dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
         NSLog(@"Latest Build Request error: %@", error);
         NSLog(@"Latest Build Request Data: %@", data);
          NSHTTPURLResponse* ne = (NSHTTPURLResponse *)response;
diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m
index 9a70ddf0e7..130e955bc0 100644
--- a/launchers/darwin/src/Launcher.m
+++ b/launchers/darwin/src/Launcher.m
@@ -9,6 +9,7 @@
 #import "Settings.h"
 #import "NSTask+NSTaskExecveAdditions.h"
 #import "Interface.h"
+#import "HQDefaults.h"
 
 @interface Launcher ()
 
@@ -382,6 +383,13 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 
     [self updateLatestBuildInfo];
 
+    NSString *kLauncherUrl = @"LAUNCHER_URL";
+    NSString *envLauncherUrl = [[NSProcessInfo processInfo] environment][kLauncherUrl];
+    if (envLauncherUrl != nil) {
+        NSLog(@"Using launcherUrl from environment: %@ = %@", kLauncherUrl, envLauncherUrl);
+        launcherUrl = envLauncherUrl;
+    }
+
     NSDictionary* launcherArguments = [LauncherCommandlineArgs arguments];
     if (newLauncherAvailable && ![launcherArguments valueForKey: @"--noUpdate"]) {
         [self.downloadLauncher downloadLauncher: launcherUrl];
@@ -459,11 +467,36 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 
 -(void)runAutoupdater
 {
-    NSTask* task = [[NSTask alloc] init]; 
+    NSException *exception;
+    bool launched = false;
     NSString* newLauncher =  [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent: @"HQ Launcher.app"];
-    task.launchPath = [newLauncher stringByAppendingString:@"/Contents/Resources/updater"];
-    task.arguments = @[[[NSBundle mainBundle] bundlePath], newLauncher];
-    [task launch];
+
+    // Older versions of Launcher put updater in `/Contents/Resources/updater`.
+    for (NSString *bundlePath in @[@"/Contents/MacOS/updater",
+                                   @"/Contents/Resources/updater",
+                                   ]) {
+        NSTask* task = [[NSTask alloc] init];
+        task.launchPath = [newLauncher stringByAppendingString: bundlePath];
+        task.arguments = @[[[NSBundle mainBundle] bundlePath], newLauncher];
+
+        NSLog(@"launching updater: %@ %@", task.launchPath, task.arguments);
+
+        @try {
+            [task launch];
+        }
+        @catch (NSException *e) {
+            NSLog(@"couldn't launch updater: %@, %@", e.name, e.reason);
+            exception = e;
+            continue;
+        }
+
+        launched = true;
+        break;
+    }
+
+    if (!launched) {
+        @throw exception;
+    }
 
     [NSApp terminate:self];
 }
@@ -483,6 +516,17 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
     [self.window makeKeyAndOrderFront:self];
 }
 
+-(void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    // Sanity check the HQDefaults so we fail early if there's an issue.
+    HQDefaults *defaults = [HQDefaults sharedDefaults];
+    if ([defaults defaultNamed:@"thunderURL"] == nil) {
+        @throw [NSException exceptionWithName:@"DefaultsNotConfigured"
+                                       reason:@"thunderURL is not configured"
+                                     userInfo:nil];
+    }
+}
+
 - (void) setDownloadFilename:(NSString *)aFilename
 {
     self.filename = aFilename;
diff --git a/launchers/darwin/src/Settings.m b/launchers/darwin/src/Settings.m
index cb9abe18b8..611e4313a1 100644
--- a/launchers/darwin/src/Settings.m
+++ b/launchers/darwin/src/Settings.m
@@ -14,19 +14,32 @@
     return sharedSettings;
 }
 
+- (NSString*) getOldFilePath {
+    Launcher* sharedLauncher = [Launcher sharedLauncher];
+    NSString* appPath = [sharedLauncher getAppPath];
+    NSString* filePath = [appPath stringByAppendingString:@"interface.app/Contents/MacOS/"];
+    return filePath;
+}
+
 - (NSString*) getFilePath
 {
     Launcher* sharedLauncher = [Launcher sharedLauncher];
     NSString* appPath = [sharedLauncher getAppPath];
-    NSString* filePath = [appPath stringByAppendingString:@"interface.app/Contents/MacOS/"];
-    
-    return filePath;
+    return appPath;
 }
 
 - (void) readDataFromJsonFile
 {
+    NSString* oldPath = [self getOldFilePath];
+    NSString* fileAtOldPath = [oldPath stringByAppendingString:@"config.json"];
     NSString* filePath = [self getFilePath];
     NSString* fileAtPath = [filePath stringByAppendingString:@"config.json"];
+
+    if ([[NSFileManager defaultManager] fileExistsAtPath:fileAtOldPath] && ![[NSFileManager defaultManager] fileExistsAtPath:fileAtPath]) {
+        BOOL success = [[NSFileManager defaultManager] moveItemAtPath:fileAtOldPath toPath:fileAtPath error:nil];
+        NSLog(@"move config to new location -> status: %@", success ? @"SUCCESS" : @"FAILED");
+    }
+
     if ([[NSFileManager defaultManager] fileExistsAtPath:fileAtPath]) {
         NSString* jsonString = [[NSString alloc] initWithData:[NSData dataWithContentsOfFile:fileAtPath] encoding:NSUTF8StringEncoding];
         NSError * err;
@@ -34,7 +47,6 @@
         NSDictionary * json;
         if (data != nil) {
             json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&err];
-            
             self.loggedIn = [[json valueForKey:@"loggedIn"] boolValue];
             self.build = [[json valueForKey:@"build_version"] integerValue];
             self.launcher = [json valueForKey:@"luancherPath"];
@@ -64,18 +76,18 @@
     NSError * err;
     NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:json options:0 error:&err];
     NSString * jsonString = [[NSString alloc] initWithData:jsonData   encoding:NSUTF8StringEncoding];
-    
+
     NSString* filePath = [self getFilePath];
     NSString* fileAtPath = [filePath stringByAppendingString:@"config.json"];
-    
+
     if (![[NSFileManager defaultManager] fileExistsAtPath:fileAtPath]) {
         NSError * error = nil;
         [[NSFileManager defaultManager] createDirectoryAtPath:filePath withIntermediateDirectories:FALSE attributes:nil error:&error];
         [[NSFileManager defaultManager] createFileAtPath:fileAtPath contents:nil attributes:nil];
-        
+
     }
     [[jsonString dataUsingEncoding:NSUTF8StringEncoding] writeToFile:fileAtPath atomically:NO];
-    
+
 }
 
 -(id)init
diff --git a/launchers/darwin/src/updater/main.m b/launchers/darwin/src/updater/main.m
index 7c7ace6f70..f8fe5a598c 100644
--- a/launchers/darwin/src/updater/main.m
+++ b/launchers/darwin/src/updater/main.m
@@ -21,15 +21,39 @@ int main(int argc, char const* argv[]) {
     for (int index = 0; index < argc; index++) {
         NSLog(@"argv at index %d = %s", index, argv[index]);
     }
+
+    NSError *error = nil;
+
     NSString* oldLauncher = [NSString stringWithUTF8String:argv[1]];
     NSString* newLauncher = [NSString stringWithUTF8String:argv[2]];
     NSURL* destinationUrl = [UpdaterHelper NSStringToNSURL:newLauncher];
     NSFileManager* fileManager = [NSFileManager defaultManager];
-    [fileManager replaceItemAtURL:[UpdaterHelper NSStringToNSURL:oldLauncher] withItemAtURL:[UpdaterHelper NSStringToNSURL:newLauncher] backupItemName:nil options:NSFileManagerItemReplacementUsingNewMetadataOnly resultingItemURL:&destinationUrl error:nil];
+    [fileManager replaceItemAtURL:[UpdaterHelper NSStringToNSURL:oldLauncher]
+                    withItemAtURL:[UpdaterHelper NSStringToNSURL:newLauncher]
+                   backupItemName:nil
+                          options:NSFileManagerItemReplacementUsingNewMetadataOnly
+                 resultingItemURL:&destinationUrl
+                            error:&error];
+    if (error != nil) {
+        NSLog(@"couldn't update launcher: %@", error);
+        return 1;
+    }
+
     NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
     NSURL* applicationURL = [UpdaterHelper NSStringToNSURL: [oldLauncher stringByAppendingString: @"/Contents/MacOS/HQ Launcher"]];
     NSArray* arguments =@[];
     NSLog(@"Launcher agruments: %@", arguments);
-    [workspace launchApplicationAtURL:applicationURL options:NSWorkspaceLaunchNewInstance configuration:[NSDictionary dictionaryWithObject:arguments forKey:NSWorkspaceLaunchConfigurationArguments] error:nil];
+
+    NSDictionary *configuration = [NSDictionary dictionaryWithObject:arguments
+                                                              forKey:NSWorkspaceLaunchConfigurationArguments];
+    [workspace launchApplicationAtURL:applicationURL
+                              options:NSWorkspaceLaunchNewInstance
+                        configuration:configuration
+                                error:&error];
+    if (error != nil) {
+        NSLog(@"couldn't start launcher: %@", error);
+        return 1;
+    }
+
     return 0;
 }
diff --git a/launchers/darwin/tests/HQDefaultsTests.m b/launchers/darwin/tests/HQDefaultsTests.m
new file mode 100644
index 0000000000..483a54e945
--- /dev/null
+++ b/launchers/darwin/tests/HQDefaultsTests.m
@@ -0,0 +1,78 @@
+//
+//  Created by Matt Hardcastle <m@hardcastle.com>
+//  Copyright 2018 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
+//
+
+#import <XCTest/XCTest.h>
+
+#import "HQDefaults.h"
+
+// Expose the `initWithArray:environment` initializer for testing.
+@interface HQDefaults(HQDefaultsTesting)
+-(id)initWithArray:(NSArray *)array environment:(NSDictionary<NSString *, NSString *> *)environment;
+@end
+
+@interface HQDefaultsTests : XCTestCase
+
+@end
+
+@implementation HQDefaultsTests
+
+// If there is not environment the default value should be used.
+- (void)testNoEnvironmentReturnsDefaultValue {
+    NSArray *array = @[@{@"name":@"foo",
+                         @"environmentVariable":@"FOO",
+                         @"defaultValue":@"bar"}];
+
+    HQDefaults *defaults = [[HQDefaults alloc] initWithArray:array
+                                                 environment:@{}];
+
+    XCTAssertEqual([defaults defaultNamed:@"foo"], @"bar");
+}
+
+// The value from the environment should overwrite the default value.
+- (void)testEnvironmentOverWritesDefaultValue {
+    NSArray *array = @[@{@"name":@"foo",
+                         @"environmentVariable":@"FOO",
+                         @"defaultValue":@"bar"}];
+    NSDictionary *environment = @{@"FOO":@"FOO_VALUE_FROM_ENVIRONMENT"};
+
+    HQDefaults *defaults = [[HQDefaults alloc] initWithArray:array environment:environment];
+
+    NSString *value = [defaults defaultNamed:@"foo"];
+
+    XCTAssertEqual(value, @"FOO_VALUE_FROM_ENVIRONMENT");
+}
+
+// An exception should be thrown if a defaults object is missing `name`.
+- (void)testMissingNameThrowsException {
+    NSArray *array = @[@{@"defaultValue":@"bar"}];
+    XCTAssertThrowsSpecificNamed([[HQDefaults alloc] initWithArray:array environment:@{}],
+                                 NSException,
+                                 @"InvalidHQDefaults");
+}
+
+// An exception should be thrown if a defaults object is missing `defaultValue`.
+- (void)testMissingDefaultValueThrowsException {
+    NSArray *array = @[@{@"name":@"foo" }];
+    XCTAssertThrowsSpecificNamed([[HQDefaults alloc] initWithArray:array environment:@{}],
+                                 NSException,
+                                 @"InvalidHQDefaults");
+}
+
+// An exception should **NOT** be thrown if a defaults object is missing `environmentVariable`.
+- (void)testMissingEnvironmentVariableDoesNotThrowException {
+    NSArray *array = @[@{@"name":@"foo", @"defaultValue":@"bar"}];
+    XCTAssertNoThrow([[HQDefaults alloc] initWithArray:array environment:@{}]);
+}
+
+// A `nil` should be returned if a default is missing.
+- (void)testEmptyDefaultIsNil {
+    HQDefaults *defaults = [[HQDefaults alloc] initWithArray:@[] environment:@{}];
+    XCTAssertNil([defaults defaultNamed:@"foo"]);
+}
+
+@end
diff --git a/launchers/darwin/tests/Info.plist b/launchers/darwin/tests/Info.plist
new file mode 100644
index 0000000000..6c40a6cd0c
--- /dev/null
+++ b/launchers/darwin/tests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp
index 1fb6207c95..386d2747d6 100644
--- a/launchers/win32/LauncherDlg.cpp
+++ b/launchers/win32/LauncherDlg.cpp
@@ -13,6 +13,8 @@
 #include "LauncherApp.h"
 #include "LauncherDlg.h"
 
+#include <propsys.h>
+#include <propkey.h>
 #include <d2d1.h>
 #pragma comment(lib, "d2d1")
 
@@ -84,7 +86,7 @@ END_MESSAGE_MAP()
 
 BOOL CLauncherDlg::OnInitDialog() {
     CDialog::OnInitDialog();
-
+    MarkWindowAsUnpinnable();
     SetIcon(m_hIcon, TRUE);         // Set big icon
     SetIcon(m_hIcon, FALSE);        // Set small icon
 
@@ -129,6 +131,19 @@ BOOL CLauncherDlg::OnInitDialog() {
     return TRUE;
 }
 
+void CLauncherDlg::MarkWindowAsUnpinnable() {
+    HWND hwnd = AfxGetMainWnd()->m_hWnd;
+    IPropertyStore* pps;
+    HRESULT hr = SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(&pps));
+    if (SUCCEEDED(hr)) {
+        PROPVARIANT var;
+        var.vt = VT_BOOL;
+        var.boolVal = VARIANT_TRUE;
+        hr = pps->SetValue(PKEY_AppUserModel_PreventPinning, var);
+        pps->Release();
+    }
+}
+
 POINT CLauncherDlg::getMouseCoords(MSG* pMsg) {
     POINT pos;
     pos.x = (int)(short)LOWORD(pMsg->lParam);
@@ -581,7 +596,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
     int xpan = 0;
     if (nIDCtl == IDC_BUTTON_NEXT) {
         if (_drawStep == DrawStep::DrawChoose || _drawStep == DrawStep::DrawLoginLogin) {
-            btnName += _drawStep == DrawStep::DrawLoginLogin ? _T("NEXT") : _T("LOG IN");
+            btnName += _drawStep == DrawStep::DrawLoginLogin ? _T("LOG IN") : _T("NEXT");
             int xpan = -20;
             defrect = CRect(rect.left - xpan, rect.top, rect.right + xpan, rect.bottom);
         } else if (_drawStep == DrawStep::DrawError) {
diff --git a/launchers/win32/LauncherDlg.h b/launchers/win32/LauncherDlg.h
index d25618c554..b0ccbfa04f 100644
--- a/launchers/win32/LauncherDlg.h
+++ b/launchers/win32/LauncherDlg.h
@@ -59,6 +59,7 @@ protected:
     BOOL getTextFormat(int ResID, TextFormat& formatOut);
     void showWindows(std::vector<CStatic*> windows, bool show);
     POINT getMouseCoords(MSG* pMsg);
+    void MarkWindowAsUnpinnable();
 
 
     bool _isConsoleRunning { false };
diff --git a/launchers/win32/LauncherManager.cpp b/launchers/win32/LauncherManager.cpp
index 991f7bd412..60bcb0f004 100644
--- a/launchers/win32/LauncherManager.cpp
+++ b/launchers/win32/LauncherManager.cpp
@@ -511,7 +511,15 @@ void LauncherManager::getMostRecentBuilds(CString& launcherUrlOut, CString& laun
         addToLog(_T("Using overridden builds domain: ") + domainName);
         useHTTPS = false;
     } else {
-        domainName = L"thunder.highfidelity.com";
+        // We have 2 ways to adjust the domain, one of which forces http (HQ_LAUNCHER_BUILDS_DOMAIN),
+        // the other (HIFI_THUNDER_URL) of which uses https. They represent different use-cases, but
+        // would ideally be combined by including the protocol in the url, but because
+        // code is going to be replaced soon, we will leave it like this for now.
+        if (domainName.GetEnvironmentVariable(L"HIFI_THUNDER_URL")) {
+            addToLog(_T("Using overridden thunder url: ") + domainName);
+        } else {
+            domainName = L"thunder.highfidelity.com";
+        }
     }
 
     CString pathName;
diff --git a/launchers/win32/LauncherUtils.cpp b/launchers/win32/LauncherUtils.cpp
index ef23073ca5..4f8e7f9a74 100644
--- a/launchers/win32/LauncherUtils.cpp
+++ b/launchers/win32/LauncherUtils.cpp
@@ -150,7 +150,7 @@ BOOL LauncherUtils::launchApplication(LPCWSTR lpApplicationName, LPTSTR cmdArgs)
     ZeroMemory(&si, sizeof(si));
     si.cb = sizeof(si);
     ZeroMemory(&pi, sizeof(pi));
-
+   
     // start the program up
     BOOL success = CreateProcess(
         lpApplicationName,   // the path
diff --git a/libraries/animation/src/AnimBlendDirectional.cpp b/libraries/animation/src/AnimBlendDirectional.cpp
new file mode 100644
index 0000000000..4e7c67f276
--- /dev/null
+++ b/libraries/animation/src/AnimBlendDirectional.cpp
@@ -0,0 +1,148 @@
+//
+//  AnimBlendDirectional.cpp
+//
+//  Created by Anthony J. Thibault on Augest 30 2019.
+//  Copyright (c) 2019 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 "AnimBlendDirectional.h"
+#include "GLMHelpers.h"
+#include "AnimationLogging.h"
+#include "AnimUtil.h"
+
+AnimBlendDirectional::AnimBlendDirectional(const QString& id, glm::vec3 alpha, const QString& centerId,
+                                           const QString& upId, const QString& downId, const QString& leftId, const QString& rightId,
+                                           const QString& upLeftId, const QString& upRightId, const QString& downLeftId, const QString& downRightId) :
+    AnimNode(AnimNode::Type::BlendDirectional, id),
+    _alpha(alpha),
+    _centerId(centerId),
+    _upId(upId),
+    _downId(downId),
+    _leftId(leftId),
+    _rightId(rightId),
+    _upLeftId(upLeftId),
+    _upRightId(upRightId),
+    _downLeftId(downLeftId),
+    _downRightId(downRightId) {
+
+}
+
+AnimBlendDirectional::~AnimBlendDirectional() {
+
+}
+
+const AnimPoseVec& AnimBlendDirectional::evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) {
+
+    // lookupRaw don't transform the vector.
+    _alpha = animVars.lookupRaw(_alphaVar, _alpha);
+    float parentDebugAlpha = context.getDebugAlpha(_id);
+
+    if (_children.size() == 9) {
+
+        // try to keep the order the same as quadrants, for _childIndices.
+        // +---+---+
+        // | 1 | 0 |
+        // +---+---+
+        // | 2 | 3 |
+        // +---+---+
+
+        std::array<int, 4> indices;
+        glm::vec2 alpha = _alpha;
+        if (_alpha.x > 0.0f) {
+            if (_alpha.y > 0.0f) {
+                // quadrant 0
+                indices = {{_childIndices[0][2], _childIndices[0][1], _childIndices[1][1], _childIndices[1][2]}};
+            } else {
+                // quadrant 3
+                indices = {{_childIndices[1][2], _childIndices[1][1], _childIndices[2][1], _childIndices[2][2]}};
+                // shift alpha up so both alpha.x and alpha.y are in the (0, 1) range.
+                alpha.y += 1.0f;
+            }
+        } else {
+            if (_alpha.y > 0.0f) {
+                // quadrant 1
+                indices = {{_childIndices[0][1], _childIndices[0][0], _childIndices[1][0], _childIndices[1][1]}};
+                // shift alpha right so both alpha.x and alpha.y are in the (0, 1) range.
+                alpha.x += 1.0f;
+            } else {
+                // quadrant 2
+                indices = {{_childIndices[1][1], _childIndices[1][0], _childIndices[2][0], _childIndices[2][1]}};
+                // shift alpha up and right so both alpha.x and alpha.y are in the (0, 1) range.
+                alpha.x += 1.0f;
+                alpha.y += 1.0f;
+            }
+        }
+        std::array<float, 4> alphas = {{
+            alpha.x * alpha.y,
+            (1.0f - alpha.x) * alpha.y,
+            (1.0f - alpha.x) * (1.0f - alpha.y),
+            alpha.x * (1.0f - alpha.y)
+        }};
+
+        // evaluate children
+        std::array<AnimPoseVec, 4> poseVecs;
+        for (int i = 0; i < 4; i++) {
+            poseVecs[i] = _children[indices[i]]->evaluate(animVars, context, dt, triggersOut);
+        }
+
+        // blend children
+        size_t minSize = INT_MAX;
+        for (int i = 0; i < 4; i++) {
+            if (poseVecs[i].size() < minSize) {
+                minSize = poseVecs[i].size();
+            }
+        }
+        _poses.resize(minSize);
+        blend4(minSize, &poseVecs[0][0], &poseVecs[1][0], &poseVecs[2][0], &poseVecs[3][0], &alphas[0], &_poses[0]);
+
+        // animation stack debug stats
+        for (int i = 0; i < 9; i++) {
+            context.setDebugAlpha(_children[i]->getID(), 0.0f, _children[i]->getType());
+        }
+        for (int i = 0; i < 4; i++) {
+            context.setDebugAlpha(_children[indices[i]]->getID(), alphas[i] * parentDebugAlpha, _children[indices[i]]->getType());
+        }
+
+    } else {
+        for (auto&& pose : _poses) {
+            pose = AnimPose::identity;
+        }
+    }
+
+    return _poses;
+}
+
+// for AnimDebugDraw rendering
+const AnimPoseVec& AnimBlendDirectional::getPosesInternal() const {
+    return _poses;
+}
+
+bool AnimBlendDirectional::lookupChildIds() {
+    _childIndices[0][0] = findChildIndexByName(_upLeftId);
+    _childIndices[0][1] = findChildIndexByName(_upId);
+    _childIndices[0][2] = findChildIndexByName(_upRightId);
+
+    _childIndices[1][0] = findChildIndexByName(_leftId);
+    _childIndices[1][1] = findChildIndexByName(_centerId);
+    _childIndices[1][2] = findChildIndexByName(_rightId);
+
+    _childIndices[2][0] = findChildIndexByName(_downLeftId);
+    _childIndices[2][1] = findChildIndexByName(_downId);
+    _childIndices[2][2] = findChildIndexByName(_downRightId);
+
+    // manditory children
+    // TODO: currently all are manditory.
+    for (int i = 0; i < 3; i++) {
+        for (int j = 0; j < 3; j++) {
+            if (_childIndices[i][j] == -1) {
+                qDebug(animation) << "Error in AnimBlendDirectional::lookupChildIds() could not find child[" << i << "," << j << "]";
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
diff --git a/libraries/animation/src/AnimBlendDirectional.h b/libraries/animation/src/AnimBlendDirectional.h
new file mode 100644
index 0000000000..9053012a79
--- /dev/null
+++ b/libraries/animation/src/AnimBlendDirectional.h
@@ -0,0 +1,59 @@
+//
+//  AnimBlendDirectonal.h
+//
+//  Created by Anthony J. Thibault on Augest 30 2019.
+//  Copyright (c) 2019 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_AnimBlendDirectional_h
+#define hifi_AnimBlendDirectional_h
+
+#include "AnimNode.h"
+
+// blend between up to nine AnimNodes.
+
+class AnimBlendDirectional : public AnimNode {
+public:
+    friend class AnimTests;
+
+    AnimBlendDirectional(const QString& id, glm::vec3 alpha, const QString& centerId,
+                         const QString& upId, const QString& downId, const QString& leftId, const QString& rightId,
+                         const QString& upLeftId, const QString& upRightId, const QString& downLeftId, const QString& downRightId);
+    virtual ~AnimBlendDirectional() override;
+
+    virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) override;
+
+    void setAlphaVar(const QString& alphaVar) { _alphaVar = alphaVar; }
+
+    bool lookupChildIds();
+
+protected:
+    // for AnimDebugDraw rendering
+    virtual const AnimPoseVec& getPosesInternal() const override;
+
+    AnimPoseVec _poses;
+
+    glm::vec3 _alpha;
+    QString _centerId;
+    QString _upId;
+    QString _downId;
+    QString _leftId;
+    QString _rightId;
+    QString _upLeftId;
+    QString _upRightId;
+    QString _downLeftId;
+    QString _downRightId;
+
+    QString _alphaVar;
+
+    int _childIndices[3][3];
+
+    // no copies
+    AnimBlendDirectional(const AnimBlendDirectional&) = delete;
+    AnimBlendDirectional& operator=(const AnimBlendDirectional&) = delete;
+};
+
+#endif // hifi_AnimBlendDirectional_h
diff --git a/libraries/animation/src/AnimBlendLinear.cpp b/libraries/animation/src/AnimBlendLinear.cpp
index 17ca88123f..d861f07847 100644
--- a/libraries/animation/src/AnimBlendLinear.cpp
+++ b/libraries/animation/src/AnimBlendLinear.cpp
@@ -14,9 +14,10 @@
 #include "AnimUtil.h"
 #include "AnimClip.h"
 
-AnimBlendLinear::AnimBlendLinear(const QString& id, float alpha) :
+AnimBlendLinear::AnimBlendLinear(const QString& id, float alpha, AnimBlendType blendType) :
     AnimNode(AnimNode::Type::BlendLinear, id),
-    _alpha(alpha) {
+    _alpha(alpha),
+    _blendType(blendType) {
 
 }
 
@@ -36,6 +37,19 @@ const AnimPoseVec& AnimBlendLinear::evaluate(const AnimVariantMap& animVars, con
     } else if (_children.size() == 1) {
         _poses = _children[0]->evaluate(animVars, context, dt, triggersOut);
         context.setDebugAlpha(_children[0]->getID(), parentDebugAlpha, _children[0]->getType());
+    } else if (_children.size() == 2 && _blendType != AnimBlendType_Normal) {
+        // special case for additive blending
+        float alpha = glm::clamp(_alpha, 0.0f, 1.0f);
+        const size_t prevPoseIndex = 0;
+        const size_t nextPoseIndex = 1;
+        evaluateAndBlendChildren(animVars, context, triggersOut, alpha, prevPoseIndex, nextPoseIndex, dt);
+
+        // for animation stack debugging
+        float weight2 = alpha;
+        float weight1 = 1.0f - weight2;
+        context.setDebugAlpha(_children[prevPoseIndex]->getID(), weight1 * parentDebugAlpha, _children[prevPoseIndex]->getType());
+        context.setDebugAlpha(_children[nextPoseIndex]->getID(), weight2 * parentDebugAlpha, _children[nextPoseIndex]->getType());
+
     } else {
         float clampedAlpha = glm::clamp(_alpha, 0.0f, (float)(_children.size() - 1));
         size_t prevPoseIndex = glm::floor(clampedAlpha);
@@ -79,7 +93,33 @@ void AnimBlendLinear::evaluateAndBlendChildren(const AnimVariantMap& animVars, c
         if (prevPoses.size() > 0 && prevPoses.size() == nextPoses.size()) {
             _poses.resize(prevPoses.size());
 
-            ::blend(_poses.size(), &prevPoses[0], &nextPoses[0], alpha, &_poses[0]);
+            if (_blendType == AnimBlendType_Normal) {
+                ::blend(_poses.size(), &prevPoses[0], &nextPoses[0], alpha, &_poses[0]);
+            } else if (_blendType == AnimBlendType_AddRelative) {
+                ::blendAdd(_poses.size(), &prevPoses[0], &nextPoses[0], alpha, &_poses[0]);
+            } else if (_blendType == AnimBlendType_AddAbsolute) {
+                // convert prev from relative to absolute
+                AnimPoseVec absPrev = prevPoses;
+                _skeleton->convertRelativePosesToAbsolute(absPrev);
+
+                // rotate the offset rotations from next into the parent relative frame of each joint.
+                AnimPoseVec relOffsetPoses;
+                relOffsetPoses.reserve(nextPoses.size());
+                for (size_t i = 0; i < nextPoses.size(); ++i) {
+
+                    // copy translation and scale from nextPoses
+                    AnimPose pose = nextPoses[i];
+
+                    // convert from a rotation that happens in the absolute space of the joint
+                    // into a rotation that happens in the relative space of the joint.
+                    pose.rot() = glm::inverse(absPrev[i].rot()) * pose.rot() * absPrev[i].rot();
+
+                    relOffsetPoses.push_back(pose);
+                }
+
+                // then blend
+                ::blendAdd(_poses.size(), &prevPoses[0], &relOffsetPoses[0], alpha, &_poses[0]);
+            }
         }
     }
 }
diff --git a/libraries/animation/src/AnimBlendLinear.h b/libraries/animation/src/AnimBlendLinear.h
index d0fe2a8503..40a20adb2c 100644
--- a/libraries/animation/src/AnimBlendLinear.h
+++ b/libraries/animation/src/AnimBlendLinear.h
@@ -27,7 +27,7 @@ class AnimBlendLinear : public AnimNode {
 public:
     friend class AnimTests;
 
-    AnimBlendLinear(const QString& id, float alpha);
+    AnimBlendLinear(const QString& id, float alpha, AnimBlendType blendType);
     virtual ~AnimBlendLinear() override;
 
     virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) override;
@@ -44,6 +44,7 @@ protected:
     AnimPoseVec _poses;
 
     float _alpha;
+    AnimBlendType _blendType;
 
     QString _alphaVar;
 
diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index e5edb46f69..3476adc80c 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -16,100 +16,6 @@
 #include "AnimationLogging.h"
 #include "AnimUtil.h"
 
-
-AnimClip::AnimClip(const QString& id, const QString& url, float startFrame, float endFrame, float timeScale, bool loopFlag, bool mirrorFlag) :
-    AnimNode(AnimNode::Type::Clip, id),
-    _startFrame(startFrame),
-    _endFrame(endFrame),
-    _timeScale(timeScale),
-    _loopFlag(loopFlag),
-    _mirrorFlag(mirrorFlag),
-    _frame(startFrame)
-{
-    loadURL(url);
-}
-
-AnimClip::~AnimClip() {
-
-}
-
-const AnimPoseVec& AnimClip::evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) {
-
-    // lookup parameters from animVars, using current instance variables as defaults.
-    _startFrame = animVars.lookup(_startFrameVar, _startFrame);
-    _endFrame = animVars.lookup(_endFrameVar, _endFrame);
-    _timeScale = animVars.lookup(_timeScaleVar, _timeScale);
-    _loopFlag = animVars.lookup(_loopFlagVar, _loopFlag);
-    _mirrorFlag = animVars.lookup(_mirrorFlagVar, _mirrorFlag);
-    float frame = animVars.lookup(_frameVar, _frame);
-
-    _frame = ::accumulateTime(_startFrame, _endFrame, _timeScale, frame, dt, _loopFlag, _id, triggersOut);
-
-    // poll network anim to see if it's finished loading yet.
-    if (_networkAnim && _networkAnim->isLoaded() && _skeleton) {
-        // loading is complete, copy animation frames from network animation, then throw it away.
-        copyFromNetworkAnim();
-        _networkAnim.reset();
-    }
-
-    if (_anim.size()) {
-
-        // lazy creation of mirrored animation frames.
-        if (_mirrorFlag && _anim.size() != _mirrorAnim.size()) {
-            buildMirrorAnim();
-        }
-
-        int prevIndex = (int)glm::floor(_frame);
-        int nextIndex;
-        if (_loopFlag && _frame >= _endFrame) {
-            nextIndex = (int)glm::ceil(_startFrame);
-        } else {
-            nextIndex = (int)glm::ceil(_frame);
-        }
-
-        // It can be quite possible for the user to set _startFrame and _endFrame to
-        // values before or past valid ranges.  We clamp the frames here.
-        int frameCount = (int)_anim.size();
-        prevIndex = std::min(std::max(0, prevIndex), frameCount - 1);
-        nextIndex = std::min(std::max(0, nextIndex), frameCount - 1);
-
-        const AnimPoseVec& prevFrame = _mirrorFlag ? _mirrorAnim[prevIndex] : _anim[prevIndex];
-        const AnimPoseVec& nextFrame = _mirrorFlag ? _mirrorAnim[nextIndex] : _anim[nextIndex];
-        float alpha = glm::fract(_frame);
-
-        ::blend(_poses.size(), &prevFrame[0], &nextFrame[0], alpha, &_poses[0]);
-    }
-
-    processOutputJoints(triggersOut);
-
-    return _poses;
-}
-
-void AnimClip::loadURL(const QString& url) {
-    auto animCache = DependencyManager::get<AnimationCache>();
-    _networkAnim = animCache->getAnimation(url);
-    _url = url;
-}
-
-void AnimClip::setCurrentFrameInternal(float frame) {
-    // because dt is 0, we should not encounter any triggers
-    const float dt = 0.0f;
-    AnimVariantMap triggers;
-    _frame = ::accumulateTime(_startFrame, _endFrame, _timeScale, frame + _startFrame, dt, _loopFlag, _id, triggers);
-}
-
-static std::vector<int> buildJointIndexMap(const AnimSkeleton& dstSkeleton, const AnimSkeleton& srcSkeleton) {
-    std::vector<int> jointIndexMap;
-    int srcJointCount = srcSkeleton.getNumJoints();
-    jointIndexMap.reserve(srcJointCount);
-    for (int srcJointIndex = 0; srcJointIndex < srcJointCount; srcJointIndex++) {
-        QString srcJointName = srcSkeleton.getJointName(srcJointIndex);
-        int dstJointIndex = dstSkeleton.nameToJointIndex(srcJointName);
-        jointIndexMap.push_back(dstJointIndex);
-    }
-    return jointIndexMap;
-}
-
 #ifdef USE_CUSTOM_ASSERT
 #undef ASSERT
 #define ASSERT(x)                     \
@@ -123,12 +29,71 @@ static std::vector<int> buildJointIndexMap(const AnimSkeleton& dstSkeleton, cons
 #define ASSERT assert
 #endif
 
-void AnimClip::copyFromNetworkAnim() {
-    assert(_networkAnim && _networkAnim->isLoaded() && _skeleton);
-    _anim.clear();
+static std::vector<int> buildJointIndexMap(const AnimSkeleton& dstSkeleton, const AnimSkeleton& srcSkeleton) {
+    std::vector<int> jointIndexMap;
+    int srcJointCount = srcSkeleton.getNumJoints();
+    jointIndexMap.reserve(srcJointCount);
+    for (int srcJointIndex = 0; srcJointIndex < srcJointCount; srcJointIndex++) {
+        QString srcJointName = srcSkeleton.getJointName(srcJointIndex);
+        int dstJointIndex = dstSkeleton.nameToJointIndex(srcJointName);
+        jointIndexMap.push_back(dstJointIndex);
+    }
+    return jointIndexMap;
+}
 
-    auto avatarSkeleton = getSkeleton();
-    const HFMModel& animModel = _networkAnim->getHFMModel();
+static void bakeRelativeDeltaAnim(std::vector<AnimPoseVec>& anim, const AnimPoseVec& basePoses) {
+
+    // invert all the basePoses
+    AnimPoseVec invBasePoses = basePoses;
+    for (auto&& invBasePose : invBasePoses) {
+        invBasePose = invBasePose.inverse();
+    }
+
+    // for each frame of the animation
+    for (auto&& animPoses : anim) {
+        ASSERT(animPoses.size() == basePoses.size());
+
+        // for each joint in animPoses
+        for (size_t i = 0; i < animPoses.size(); ++i) {
+            // convert this relative AnimPose into a delta animation.
+            animPoses[i] = invBasePoses[i] * animPoses[i];
+        }
+    }
+}
+
+void bakeAbsoluteDeltaAnim(std::vector<AnimPoseVec>& anim, const AnimPoseVec& basePoses, AnimSkeleton::ConstPointer skeleton) {
+
+    // invert all the basePoses
+    AnimPoseVec invBasePoses = basePoses;
+    for (auto&& invBasePose : invBasePoses) {
+        invBasePose = invBasePose.inverse();
+    }
+
+    AnimPoseVec absBasePoses = basePoses;
+    skeleton->convertRelativePosesToAbsolute(absBasePoses);
+
+    // for each frame of the animation
+    for (auto&& animPoses : anim) {
+        ASSERT(animPoses.size() == basePoses.size());
+
+        // for each joint in animPoses
+        for (size_t i = 0; i < animPoses.size(); ++i) {
+
+            // scale and translation are relative frame
+            animPoses[i] = invBasePoses[i] * animPoses[i];
+
+            // convert from a rotation that happens in the relative space of the joint
+            // into a rotation that happens in the absolute space of the joint.
+            animPoses[i].rot() = absBasePoses[i].rot() * animPoses[i].rot() * glm::inverse(absBasePoses[i].rot());
+        }
+    }
+}
+
+static std::vector<AnimPoseVec> copyAndRetargetFromNetworkAnim(AnimationPointer networkAnim, AnimSkeleton::ConstPointer avatarSkeleton) {
+    ASSERT(networkAnim && networkAnim->isLoaded() && avatarSkeleton);
+    std::vector<AnimPoseVec> anim;
+
+    const HFMModel& animModel = networkAnim->getHFMModel();
     AnimSkeleton animSkeleton(animModel);
     const int animJointCount = animSkeleton.getNumJoints();
     const int avatarJointCount = avatarSkeleton->getNumJoints();
@@ -137,7 +102,7 @@ void AnimClip::copyFromNetworkAnim() {
     std::vector<int> avatarToAnimJointIndexMap = buildJointIndexMap(animSkeleton, *avatarSkeleton);
 
     const int animFrameCount = animModel.animationFrames.size();
-    _anim.resize(animFrameCount);
+    anim.resize(animFrameCount);
 
     // find the size scale factor for translation in the animation.
     float boneLengthScale = 1.0f;
@@ -223,8 +188,8 @@ void AnimClip::copyFromNetworkAnim() {
         // convert avatar rotations into relative frame
         avatarSkeleton->convertAbsoluteRotationsToRelative(avatarRotations);
 
-        ASSERT(frame >= 0 && frame < (int)_anim.size());
-        _anim[frame].reserve(avatarJointCount);
+        ASSERT(frame >= 0 && frame < (int)anim.size());
+        anim[frame].reserve(avatarJointCount);
         for (int avatarJointIndex = 0; avatarJointIndex < avatarJointCount; avatarJointIndex++) {
             const AnimPose& avatarDefaultPose = avatarSkeleton->getRelativeDefaultPose(avatarJointIndex);
 
@@ -251,14 +216,129 @@ void AnimClip::copyFromNetworkAnim() {
 
             // build the final pose
             ASSERT(avatarJointIndex >= 0 && avatarJointIndex < (int)avatarRotations.size());
-            _anim[frame].push_back(AnimPose(relativeScale, avatarRotations[avatarJointIndex], relativeTranslation));
+            anim[frame].push_back(AnimPose(relativeScale, avatarRotations[avatarJointIndex], relativeTranslation));
         }
     }
 
-    // mirrorAnim will be re-built on demand, if needed.
-    _mirrorAnim.clear();
+    return anim;
+}
 
-    _poses.resize(avatarJointCount);
+AnimClip::AnimClip(const QString& id, const QString& url, float startFrame, float endFrame, float timeScale, bool loopFlag, bool mirrorFlag,
+                   AnimBlendType blendType, const QString& baseURL, float baseFrame) :
+    AnimNode(AnimNode::Type::Clip, id),
+    _startFrame(startFrame),
+    _endFrame(endFrame),
+    _timeScale(timeScale),
+    _loopFlag(loopFlag),
+    _mirrorFlag(mirrorFlag),
+    _frame(startFrame),
+    _blendType(blendType),
+    _baseFrame(baseFrame)
+{
+    loadURL(url);
+
+    if (blendType != AnimBlendType_Normal) {
+        auto animCache = DependencyManager::get<AnimationCache>();
+        _baseNetworkAnim = animCache->getAnimation(baseURL);
+        _baseURL = baseURL;
+    }
+}
+
+AnimClip::~AnimClip() {
+
+}
+
+const AnimPoseVec& AnimClip::evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) {
+
+    // lookup parameters from animVars, using current instance variables as defaults.
+    _startFrame = animVars.lookup(_startFrameVar, _startFrame);
+    _endFrame = animVars.lookup(_endFrameVar, _endFrame);
+    _timeScale = animVars.lookup(_timeScaleVar, _timeScale);
+    _loopFlag = animVars.lookup(_loopFlagVar, _loopFlag);
+    _mirrorFlag = animVars.lookup(_mirrorFlagVar, _mirrorFlag);
+    float frame = animVars.lookup(_frameVar, _frame);
+
+    _frame = ::accumulateTime(_startFrame, _endFrame, _timeScale, frame, dt, _loopFlag, _id, triggersOut);
+
+    // poll network anim to see if it's finished loading yet.
+    if (_blendType == AnimBlendType_Normal) {
+        if (_networkAnim && _networkAnim->isLoaded() && _skeleton) {
+            // loading is complete, copy & retarget animation.
+            _anim = copyAndRetargetFromNetworkAnim(_networkAnim, _skeleton);
+
+            // we no longer need the actual animation resource anymore.
+            _networkAnim.reset();
+
+            // mirrorAnim will be re-built on demand, if needed.
+            _mirrorAnim.clear();
+
+            _poses.resize(_skeleton->getNumJoints());
+        }
+    } else {
+        // an additive blend type
+        if (_networkAnim && _networkAnim->isLoaded() && _baseNetworkAnim && _baseNetworkAnim->isLoaded() && _skeleton) {
+            // loading is complete, copy & retarget animation.
+            _anim = copyAndRetargetFromNetworkAnim(_networkAnim, _skeleton);
+
+            // we no longer need the actual animation resource anymore.
+            _networkAnim.reset();
+
+            // mirrorAnim will be re-built on demand, if needed.
+            // TODO: handle mirrored relative animations.
+            _mirrorAnim.clear();
+
+            _poses.resize(_skeleton->getNumJoints());
+
+            // copy & retarget baseAnim!
+            auto baseAnim = copyAndRetargetFromNetworkAnim(_baseNetworkAnim, _skeleton);
+
+            if (_blendType == AnimBlendType_AddAbsolute) {
+                bakeAbsoluteDeltaAnim(_anim, baseAnim[(int)_baseFrame], _skeleton);
+            } else {
+                // AnimBlendType_AddRelative
+                bakeRelativeDeltaAnim(_anim, baseAnim[(int)_baseFrame]);
+            }
+        }
+    }
+
+    if (_anim.size()) {
+
+        // lazy creation of mirrored animation frames.
+        if (_mirrorFlag && _anim.size() != _mirrorAnim.size()) {
+            buildMirrorAnim();
+        }
+
+        int prevIndex = (int)glm::floor(_frame);
+        int nextIndex;
+        if (_loopFlag && _frame >= _endFrame) {
+            nextIndex = (int)glm::ceil(_startFrame);
+        } else {
+            nextIndex = (int)glm::ceil(_frame);
+        }
+
+        // It can be quite possible for the user to set _startFrame and _endFrame to
+        // values before or past valid ranges.  We clamp the frames here.
+        int frameCount = (int)_anim.size();
+        prevIndex = std::min(std::max(0, prevIndex), frameCount - 1);
+        nextIndex = std::min(std::max(0, nextIndex), frameCount - 1);
+
+        const AnimPoseVec& prevFrame = _mirrorFlag ? _mirrorAnim[prevIndex] : _anim[prevIndex];
+        const AnimPoseVec& nextFrame = _mirrorFlag ? _mirrorAnim[nextIndex] : _anim[nextIndex];
+        float alpha = glm::fract(_frame);
+
+        ::blend(_poses.size(), &prevFrame[0], &nextFrame[0], alpha, &_poses[0]);
+    }
+
+    processOutputJoints(triggersOut);
+
+    return _poses;
+}
+
+void AnimClip::setCurrentFrameInternal(float frame) {
+    // because dt is 0, we should not encounter any triggers
+    const float dt = 0.0f;
+    AnimVariantMap triggers;
+    _frame = ::accumulateTime(_startFrame, _endFrame, _timeScale, frame + _startFrame, dt, _loopFlag, _id, triggers);
 }
 
 void AnimClip::buildMirrorAnim() {
@@ -275,3 +355,9 @@ void AnimClip::buildMirrorAnim() {
 const AnimPoseVec& AnimClip::getPosesInternal() const {
     return _poses;
 }
+
+void AnimClip::loadURL(const QString& url) {
+    auto animCache = DependencyManager::get<AnimationCache>();
+    _networkAnim = animCache->getAnimation(url);
+    _url = url;
+}
diff --git a/libraries/animation/src/AnimClip.h b/libraries/animation/src/AnimClip.h
index 92f4c01dcc..24acdcf20a 100644
--- a/libraries/animation/src/AnimClip.h
+++ b/libraries/animation/src/AnimClip.h
@@ -25,7 +25,8 @@ class AnimClip : public AnimNode {
 public:
     friend class AnimTests;
 
-    AnimClip(const QString& id, const QString& url, float startFrame, float endFrame, float timeScale, bool loopFlag, bool mirrorFlag);
+    AnimClip(const QString& id, const QString& url, float startFrame, float endFrame, float timeScale, bool loopFlag, bool mirrorFlag,
+             AnimBlendType blendType, const QString& baseURL, float baseFrame);
     virtual ~AnimClip() override;
 
     virtual const AnimPoseVec& evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) override;
@@ -52,19 +53,20 @@ public:
     void setMirrorFlag(bool mirrorFlag) { _mirrorFlag = mirrorFlag; }
 
     float getFrame() const { return _frame; }
-
     void loadURL(const QString& url);
+
 protected:
 
     virtual void setCurrentFrameInternal(float frame) override;
 
-    void copyFromNetworkAnim();
     void buildMirrorAnim();
 
     // for AnimDebugDraw rendering
     virtual const AnimPoseVec& getPosesInternal() const override;
 
     AnimationPointer _networkAnim;
+    AnimationPointer _baseNetworkAnim;
+
     AnimPoseVec _poses;
 
     // _anim[frame][joint]
@@ -78,6 +80,9 @@ protected:
     bool _loopFlag;
     bool _mirrorFlag;
     float _frame;
+    AnimBlendType _blendType;
+    QString _baseURL;
+    float _baseFrame;
 
     QString _startFrameVar;
     QString _endFrameVar;
diff --git a/libraries/animation/src/AnimContext.h b/libraries/animation/src/AnimContext.h
index 5f353fcae4..68b44c8f56 100644
--- a/libraries/animation/src/AnimContext.h
+++ b/libraries/animation/src/AnimContext.h
@@ -31,9 +31,17 @@ enum class AnimNodeType {
     TwoBoneIK,
     SplineIK,
     PoleVectorConstraint,
+    BlendDirectional,
     NumTypes
 };
 
+enum AnimBlendType {
+    AnimBlendType_Normal,
+    AnimBlendType_AddRelative,
+    AnimBlendType_AddAbsolute,
+    AnimBlendType_NumTypes
+};
+
 class AnimContext {
 public:
     AnimContext() {}
diff --git a/libraries/animation/src/AnimNode.cpp b/libraries/animation/src/AnimNode.cpp
index f055e6b473..930be9769c 100644
--- a/libraries/animation/src/AnimNode.cpp
+++ b/libraries/animation/src/AnimNode.cpp
@@ -60,6 +60,13 @@ void AnimNode::setCurrentFrame(float frame) {
     }
 }
 
+void AnimNode::setActive(bool active) {
+    setActiveInternal(active);
+    for (auto&& child : _children) {
+        child->setActiveInternal(active);
+    }
+}
+
 void AnimNode::processOutputJoints(AnimVariantMap& triggersOut) const {
     if (!_skeleton) {
         return;
diff --git a/libraries/animation/src/AnimNode.h b/libraries/animation/src/AnimNode.h
index ec5f2b7375..3ec671fcd7 100644
--- a/libraries/animation/src/AnimNode.h
+++ b/libraries/animation/src/AnimNode.h
@@ -73,6 +73,7 @@ public:
     }
 
     void setCurrentFrame(float frame);
+    void setActive(bool active);
 
     template <typename F>
     bool traverse(F func) {
@@ -98,12 +99,22 @@ public:
         return result;
     }
 
+    int findChildIndexByName(const QString& id) {
+        for (size_t i = 0; i < _children.size(); ++i) {
+            if (_children[i]->getID() == id) {
+                return (int)i;
+            }
+        }
+        return -1;
+    }
+
     const AnimPoseVec& getPoses() const { return getPosesInternal(); }
 
 protected:
 
     virtual void setCurrentFrameInternal(float frame) {}
     virtual void setSkeletonInternal(AnimSkeleton::ConstPointer skeleton) { _skeleton = skeleton; }
+    virtual void setActiveInternal(bool active) {}
 
     // for AnimDebugDraw rendering
     virtual const AnimPoseVec& getPosesInternal() const = 0;
@@ -116,6 +127,7 @@ protected:
     AnimSkeleton::ConstPointer _skeleton;
     std::weak_ptr<AnimNode> _parent;
     std::vector<QString> _outputJointNames;
+    bool _active { false };
 
     // no copies
     AnimNode(const AnimNode&) = delete;
diff --git a/libraries/animation/src/AnimNodeLoader.cpp b/libraries/animation/src/AnimNodeLoader.cpp
index d43351fff9..9474c0309f 100644
--- a/libraries/animation/src/AnimNodeLoader.cpp
+++ b/libraries/animation/src/AnimNodeLoader.cpp
@@ -29,6 +29,7 @@
 #include "AnimTwoBoneIK.h"
 #include "AnimSplineIK.h"
 #include "AnimPoleVectorConstraint.h"
+#include "AnimBlendDirectional.h"
 #include "AnimUtil.h"
 
 using NodeLoaderFunc = AnimNode::Pointer (*)(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
@@ -47,6 +48,7 @@ static AnimNode::Pointer loadDefaultPoseNode(const QJsonObject& jsonObj, const Q
 static AnimNode::Pointer loadTwoBoneIKNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 static AnimNode::Pointer loadSplineIKNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 static AnimNode::Pointer loadPoleVectorConstraintNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
+static AnimNode::Pointer loadBlendDirectionalNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 
 static const float ANIM_GRAPH_LOAD_PRIORITY = 10.0f;
 
@@ -55,6 +57,7 @@ static const float ANIM_GRAPH_LOAD_PRIORITY = 10.0f;
 static bool processDoNothing(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl) { return true; }
 bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 bool processRandomSwitchStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
+bool processBlendDirectionalNode(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 
 static const char* animNodeTypeToString(AnimNode::Type type) {
     switch (type) {
@@ -70,6 +73,7 @@ static const char* animNodeTypeToString(AnimNode::Type type) {
     case AnimNode::Type::TwoBoneIK: return "twoBoneIK";
     case AnimNode::Type::SplineIK: return "splineIK";
     case AnimNode::Type::PoleVectorConstraint: return "poleVectorConstraint";
+    case AnimNode::Type::BlendDirectional: return "blendDirectional";
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -161,6 +165,19 @@ static EasingType stringToEasingType(const QString& str) {
     }
 }
 
+static AnimBlendType stringToAnimBlendType(const QString& str) {
+    if (str == "normal") {
+        return AnimBlendType_Normal;
+    } else if (str == "addRelative") {
+        return AnimBlendType_AddRelative;
+    } else if (str == "addAbsolute") {
+        return AnimBlendType_AddAbsolute;
+    } else {
+        return AnimBlendType_NumTypes;
+    }
+}
+
+
 static const char* animManipulatorJointVarTypeToString(AnimManipulator::JointVar::Type type) {
     switch (type) {
     case AnimManipulator::JointVar::Type::Absolute: return "absolute";
@@ -198,6 +215,7 @@ static NodeLoaderFunc animNodeTypeToLoaderFunc(AnimNode::Type type) {
     case AnimNode::Type::TwoBoneIK: return loadTwoBoneIKNode;
     case AnimNode::Type::SplineIK: return loadSplineIKNode;
     case AnimNode::Type::PoleVectorConstraint: return loadPoleVectorConstraintNode;
+    case AnimNode::Type::BlendDirectional: return loadBlendDirectionalNode;
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -217,6 +235,7 @@ static NodeProcessFunc animNodeTypeToProcessFunc(AnimNode::Type type) {
     case AnimNode::Type::TwoBoneIK: return processDoNothing;
     case AnimNode::Type::SplineIK: return processDoNothing;
     case AnimNode::Type::PoleVectorConstraint: return processDoNothing;
+    case AnimNode::Type::BlendDirectional: return processBlendDirectionalNode;
     case AnimNode::Type::NumTypes: return nullptr;
     };
     return nullptr;
@@ -374,6 +393,9 @@ static AnimNode::Pointer loadClipNode(const QJsonObject& jsonObj, const QString&
     READ_FLOAT(timeScale, jsonObj, id, jsonUrl, nullptr);
     READ_BOOL(loopFlag, jsonObj, id, jsonUrl, nullptr);
     READ_OPTIONAL_BOOL(mirrorFlag, jsonObj, false);
+    READ_OPTIONAL_STRING(blendType, jsonObj);
+    READ_OPTIONAL_STRING(baseURL, jsonObj);
+    READ_OPTIONAL_FLOAT(baseFrame, jsonObj, 0.0f);
 
     READ_OPTIONAL_STRING(startFrameVar, jsonObj);
     READ_OPTIONAL_STRING(endFrameVar, jsonObj);
@@ -381,11 +403,21 @@ static AnimNode::Pointer loadClipNode(const QJsonObject& jsonObj, const QString&
     READ_OPTIONAL_STRING(loopFlagVar, jsonObj);
     READ_OPTIONAL_STRING(mirrorFlagVar, jsonObj);
 
+
     // animation urls can be relative to the containing url document.
     auto tempUrl = QUrl(url);
     tempUrl = jsonUrl.resolved(tempUrl);
 
-    auto node = std::make_shared<AnimClip>(id, tempUrl.toString(), startFrame, endFrame, timeScale, loopFlag, mirrorFlag);
+    AnimBlendType blendTypeEnum = AnimBlendType_Normal;  // default value
+    if (!blendType.isEmpty()) {
+        blendTypeEnum = stringToAnimBlendType(blendType);
+        if (blendTypeEnum == AnimBlendType_NumTypes) {
+            qCCritical(animation) << "AnimNodeLoader, bad blendType on clip, id = " << id;
+            return nullptr;
+        }
+    }
+
+    auto node = std::make_shared<AnimClip>(id, tempUrl.toString(), startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendTypeEnum, baseURL, baseFrame);
 
     if (!startFrameVar.isEmpty()) {
         node->setStartFrameVar(startFrameVar);
@@ -409,10 +441,19 @@ static AnimNode::Pointer loadClipNode(const QJsonObject& jsonObj, const QString&
 static AnimNode::Pointer loadBlendLinearNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl) {
 
     READ_FLOAT(alpha, jsonObj, id, jsonUrl, nullptr);
-
+    READ_OPTIONAL_STRING(blendType, jsonObj);
     READ_OPTIONAL_STRING(alphaVar, jsonObj);
 
-    auto node = std::make_shared<AnimBlendLinear>(id, alpha);
+    AnimBlendType blendTypeEnum = AnimBlendType_Normal;  // default value
+    if (!blendType.isEmpty()) {
+        blendTypeEnum = stringToAnimBlendType(blendType);
+        if (blendTypeEnum == AnimBlendType_NumTypes) {
+            qCCritical(animation) << "AnimNodeLoader, bad blendType on blendLinear, id = " << id;
+            return nullptr;
+        }
+    }
+
+    auto node = std::make_shared<AnimBlendLinear>(id, alpha, blendTypeEnum);
 
     if (!alphaVar.isEmpty()) {
         node->setAlphaVar(alphaVar);
@@ -736,6 +777,32 @@ static AnimNode::Pointer loadPoleVectorConstraintNode(const QJsonObject& jsonObj
     return node;
 }
 
+static AnimNode::Pointer loadBlendDirectionalNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl) {
+
+    READ_VEC3(alpha, jsonObj, id, jsonUrl, nullptr);
+    READ_OPTIONAL_STRING(alphaVar, jsonObj);
+
+    READ_OPTIONAL_STRING(centerId, jsonObj);
+    READ_OPTIONAL_STRING(upId, jsonObj);
+    READ_OPTIONAL_STRING(downId, jsonObj);
+    READ_OPTIONAL_STRING(leftId, jsonObj);
+    READ_OPTIONAL_STRING(rightId, jsonObj);
+    READ_OPTIONAL_STRING(upLeftId, jsonObj);
+    READ_OPTIONAL_STRING(upRightId, jsonObj);
+    READ_OPTIONAL_STRING(downLeftId, jsonObj);
+    READ_OPTIONAL_STRING(downRightId, jsonObj);
+
+    auto node = std::make_shared<AnimBlendDirectional>(id, alpha, centerId,
+                                                       upId, downId, leftId, rightId,
+                                                       upLeftId, upRightId, downLeftId, downRightId);
+
+    if (!alphaVar.isEmpty()) {
+        node->setAlphaVar(alphaVar);
+    }
+
+    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));
@@ -1006,7 +1073,12 @@ bool processRandomSwitchStateMachineNode(AnimNode::Pointer node, const QJsonObje
     return true;
 }
 
+bool processBlendDirectionalNode(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& nodeId, const QUrl& jsonUrl) {
+    auto blendNode = std::static_pointer_cast<AnimBlendDirectional>(node);
+    assert(blendNode);
 
+    return blendNode->lookupChildIds();
+}
 
 AnimNodeLoader::AnimNodeLoader(const QUrl& url) :
     _url(url)
diff --git a/libraries/animation/src/AnimRandomSwitch.cpp b/libraries/animation/src/AnimRandomSwitch.cpp
index 68c7031de8..4f137f7be4 100644
--- a/libraries/animation/src/AnimRandomSwitch.cpp
+++ b/libraries/animation/src/AnimRandomSwitch.cpp
@@ -21,12 +21,16 @@ AnimRandomSwitch::~AnimRandomSwitch() {
 
 }
 
+void AnimRandomSwitch::setActiveInternal(bool active) {
+    _active = active;
+    _triggerNewRandomState = active;
+}
+
 const AnimPoseVec& AnimRandomSwitch::evaluate(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut) {
     float parentDebugAlpha = context.getDebugAlpha(_id);
 
     AnimRandomSwitch::RandomSwitchState::Pointer desiredState = _currentState;
-    if (abs(_randomSwitchEvaluationCount - context.getEvaluationCount()) > 1 || animVars.lookup(_triggerRandomSwitchVar, false)) {
-
+    if (_triggerNewRandomState || animVars.lookup(_triggerRandomSwitchVar, false)) {
         // filter states different to the last random state and with priorities.
         bool currentStateHasPriority = false;
         std::vector<RandomSwitchState::Pointer> randomStatesToConsider;
@@ -56,8 +60,9 @@ const AnimPoseVec& AnimRandomSwitch::evaluate(const AnimVariantMap& animVars, co
             }
             lowerBound = upperBound;
         }
-        if (abs(_randomSwitchEvaluationCount - context.getEvaluationCount()) > 1) {
+        if (_triggerNewRandomState) {
             switchRandomState(animVars, context, desiredState, false);
+            _triggerNewRandomState = false;
         } else {
             // firing a random switch, be sure that we aren't completing a previously triggered transition
             if (currentStateHasPriority) {
@@ -70,7 +75,6 @@ const AnimPoseVec& AnimRandomSwitch::evaluate(const AnimVariantMap& animVars, co
         }
         _triggerTime = randFloatInRange(_triggerTimeMin, _triggerTimeMax);
         _randomSwitchTime = randFloatInRange(_randomSwitchTimeMin, _randomSwitchTimeMax);
-
     } else {
 
         // here we are checking to see if we want a temporary movement
@@ -143,7 +147,6 @@ const AnimPoseVec& AnimRandomSwitch::evaluate(const AnimVariantMap& animVars, co
         _poses = currentStateNode->evaluate(animVars, context, dt, triggersOut);
     }
 
-    _randomSwitchEvaluationCount = context.getEvaluationCount();
     processOutputJoints(triggersOut);
 
     context.addStateMachineInfo(_id, _currentState->getID(), _previousState->getID(), _duringInterp, _alpha);
@@ -165,8 +168,16 @@ void AnimRandomSwitch::addState(RandomSwitchState::Pointer randomState) {
 }
 
 void AnimRandomSwitch::switchRandomState(const AnimVariantMap& animVars, const AnimContext& context, RandomSwitchState::Pointer desiredState, bool shouldInterp) {
+
+    auto prevStateNode = _children[_currentState->getChildIndex()];
     auto nextStateNode = _children[desiredState->getChildIndex()];
+
+    // activate/deactivate states
+    prevStateNode->setActive(false);
+    nextStateNode->setActive(true);
+
     _lastPlayedState = nextStateNode->getID();
+
     if (shouldInterp) {
 
         bool interpActive = _duringInterp;
diff --git a/libraries/animation/src/AnimRandomSwitch.h b/libraries/animation/src/AnimRandomSwitch.h
index 888ed1f6b5..490e2f86e1 100644
--- a/libraries/animation/src/AnimRandomSwitch.h
+++ b/libraries/animation/src/AnimRandomSwitch.h
@@ -151,10 +151,11 @@ protected:
 
     // for AnimDebugDraw rendering
     virtual const AnimPoseVec& getPosesInternal() const override;
+    virtual void setActiveInternal(bool active) override;
 
     AnimPoseVec _poses;
 
-    int _randomSwitchEvaluationCount { 0 };
+    bool _triggerNewRandomState = false;
     // interpolation state
     bool _duringInterp = false;
     InterpType _interpType { InterpType::SnapshotPrev };
diff --git a/libraries/animation/src/AnimStateMachine.cpp b/libraries/animation/src/AnimStateMachine.cpp
index 658309ce71..51e7a24136 100644
--- a/libraries/animation/src/AnimStateMachine.cpp
+++ b/libraries/animation/src/AnimStateMachine.cpp
@@ -128,6 +128,10 @@ void AnimStateMachine::switchState(const AnimVariantMap& animVars, const AnimCon
     auto prevStateNode = _children[_currentState->getChildIndex()];
     auto nextStateNode = _children[desiredState->getChildIndex()];
 
+    // activate/deactivate states
+    prevStateNode->setActive(false);
+    nextStateNode->setActive(true);
+
     bool interpActive = _duringInterp;
     _duringInterp = true;
     _alpha = 0.0f;
diff --git a/libraries/animation/src/AnimUtil.cpp b/libraries/animation/src/AnimUtil.cpp
index f4f922d704..0a8b2fe286 100644
--- a/libraries/animation/src/AnimUtil.cpp
+++ b/libraries/animation/src/AnimUtil.cpp
@@ -15,7 +15,6 @@
 
 // TODO: use restrict keyword
 // TODO: excellent candidate for simd vectorization.
-
 void blend(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, AnimPose* result) {
     for (size_t i = 0; i < numPoses; i++) {
         const AnimPose& aPose = a[i];
@@ -27,6 +26,55 @@ void blend(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, A
     }
 }
 
+void blend3(size_t numPoses, const AnimPose* a, const AnimPose* b, const AnimPose* c, float* alphas, AnimPose* result) {
+    for (size_t i = 0; i < numPoses; i++) {
+        const AnimPose& aPose = a[i];
+        const AnimPose& bPose = b[i];
+        const AnimPose& cPose = c[i];
+
+        result[i].scale() = alphas[0] * aPose.scale() + alphas[1] * bPose.scale() + alphas[2] * cPose.scale();
+        result[i].rot() = safeLinearCombine3(aPose.rot(), bPose.rot(), cPose.rot(), alphas);
+        result[i].trans() = alphas[0] * aPose.trans() + alphas[1] * bPose.trans() + alphas[2] * cPose.trans();
+    }
+}
+
+void blend4(size_t numPoses, const AnimPose* a, const AnimPose* b, const AnimPose* c, const AnimPose* d, float* alphas, AnimPose* result) {
+    for (size_t i = 0; i < numPoses; i++) {
+        const AnimPose& aPose = a[i];
+        const AnimPose& bPose = b[i];
+        const AnimPose& cPose = c[i];
+        const AnimPose& dPose = d[i];
+
+        result[i].scale() = alphas[0] * aPose.scale() + alphas[1] * bPose.scale() + alphas[2] * cPose.scale() + alphas[3] * dPose.scale();
+        result[i].rot() = safeLinearCombine4(aPose.rot(), bPose.rot(), cPose.rot(), dPose.rot(), alphas);
+        result[i].trans() = alphas[0] * aPose.trans() + alphas[1] * bPose.trans() + alphas[2] * cPose.trans() + alphas[3] * dPose.trans();
+    }
+}
+
+// additive blend
+void blendAdd(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, AnimPose* result) {
+
+    const glm::vec3 IDENTITY_SCALE = glm::vec3(1.0f);
+    const glm::quat IDENTITY_ROT = glm::quat();
+
+    for (size_t i = 0; i < numPoses; i++) {
+        const AnimPose& aPose = a[i];
+        const AnimPose& bPose = b[i];
+
+        result[i].scale() = aPose.scale() * lerp(IDENTITY_SCALE, bPose.scale(), alpha);
+
+        // ensure that delta has the same "polarity" as the identity quat.
+        // we don't need to do a full dot product, just sign of w is sufficient.
+        glm::quat delta = bPose.rot();
+        if (delta.w < 0.0f) {
+            delta = -delta;
+        }
+        delta = glm::lerp(IDENTITY_ROT, delta, alpha);
+        result[i].rot() = glm::normalize(aPose.rot() * delta);
+        result[i].trans() = aPose.trans() + (alpha * bPose.trans());
+    }
+}
+
 glm::quat averageQuats(size_t numQuats, const glm::quat* quats) {
     if (numQuats == 0) {
         return glm::quat();
diff --git a/libraries/animation/src/AnimUtil.h b/libraries/animation/src/AnimUtil.h
index 26dc19da06..00bddb8b7e 100644
--- a/libraries/animation/src/AnimUtil.h
+++ b/libraries/animation/src/AnimUtil.h
@@ -16,6 +16,15 @@
 // this is where the magic happens
 void blend(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, AnimPose* result);
 
+// blend between three sets of poses
+void blend3(size_t numPoses, const AnimPose* a, const AnimPose* b, const AnimPose* c, float* alphas, AnimPose* result);
+
+// blend between four sets of poses
+void blend4(size_t numPoses, const AnimPose* a, const AnimPose* b, const AnimPose* c, const AnimPose* d, float* alphas, AnimPose* result);
+
+// additive blending
+void blendAdd(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, AnimPose* result);
+
 glm::quat averageQuats(size_t numQuats, const glm::quat* quats);
 
 float accumulateTime(float startFrame, float endFrame, float timeScale, float currentFrame, float dt, bool loopFlag,
@@ -31,6 +40,41 @@ inline glm::quat safeLerp(const glm::quat& a, const glm::quat& b, float alpha) {
     return glm::normalize(glm::lerp(a, bTemp, alpha));
 }
 
+inline glm::quat safeLinearCombine3(const glm::quat& a, const glm::quat& b, const glm::quat& c, float* alphas) {
+    // adjust signs for b & c if necessary
+    glm::quat bTemp = b;
+    float dot = glm::dot(a, bTemp);
+    if (dot < 0.0f) {
+        bTemp = -bTemp;
+    }
+    glm::quat cTemp = c;
+    dot = glm::dot(a, cTemp);
+    if (dot < 0.0f) {
+        cTemp = -cTemp;
+    }
+    return glm::normalize(alphas[0] * a + alphas[1] * bTemp + alphas[2] * cTemp);
+}
+
+inline glm::quat safeLinearCombine4(const glm::quat& a, const glm::quat& b, const glm::quat& c, const glm::quat& d, float* alphas) {
+    // adjust signs for b, c & d if necessary
+    glm::quat bTemp = b;
+    float dot = glm::dot(a, bTemp);
+    if (dot < 0.0f) {
+        bTemp = -bTemp;
+    }
+    glm::quat cTemp = c;
+    dot = glm::dot(a, cTemp);
+    if (dot < 0.0f) {
+        cTemp = -cTemp;
+    }
+    glm::quat dTemp = d;
+    dot = glm::dot(a, dTemp);
+    if (dot < 0.0f) {
+        dTemp = -dTemp;
+    }
+    return glm::normalize(alphas[0] * a + alphas[1] * bTemp + alphas[2] * cTemp + alphas[3] * dTemp);
+}
+
 AnimPose boneLookAt(const glm::vec3& target, const AnimPose& bone);
 
 // This will attempt to determine the proper body facing of a characters body
diff --git a/libraries/animation/src/AnimVariant.cpp b/libraries/animation/src/AnimVariant.cpp
index 930dbed2d9..eb9e595c88 100644
--- a/libraries/animation/src/AnimVariant.cpp
+++ b/libraries/animation/src/AnimVariant.cpp
@@ -141,32 +141,26 @@ std::map<QString, QString> AnimVariantMap::toDebugMap() const {
             break;
         case AnimVariant::Type::Vec3: {
             // To prevent filling up debug stats, don't show vec3 values
-            /*
             glm::vec3 value = pair.second.getVec3();
             result[pair.first] = QString("(%1, %2, %3)").
                 arg(QString::number(value.x, 'f', 3)).
                 arg(QString::number(value.y, 'f', 3)).
                 arg(QString::number(value.z, 'f', 3));
-            */
             break;
         }
         case AnimVariant::Type::Quat: {
             // To prevent filling up the anim stats, don't show quat values
-            /*
             glm::quat value = pair.second.getQuat();
             result[pair.first] = QString("(%1, %2, %3, %4)").
                 arg(QString::number(value.x, 'f', 3)).
                 arg(QString::number(value.y, 'f', 3)).
                 arg(QString::number(value.z, 'f', 3)).
                 arg(QString::number(value.w, 'f', 3));
-            */
             break;
         }
         case AnimVariant::Type::String:
             // To prevent filling up anim stats, don't show string values
-            /*
             result[pair.first] = pair.second.getString();
-            */
             break;
         default:
             // invalid AnimVariant::Type
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 211c54def8..d63c2d6a9b 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -564,7 +564,7 @@ void Rig::overrideRoleAnimation(const QString& role, const QString& url, float f
             _origRoleAnimations[role] = node;
             const float REFERENCE_FRAMES_PER_SECOND = 30.0f;
             float timeScale = fps / REFERENCE_FRAMES_PER_SECOND;
-            auto clipNode = std::make_shared<AnimClip>(role, url, firstFrame, lastFrame, timeScale, loop, false);
+            auto clipNode = std::make_shared<AnimClip>(role, url, firstFrame, lastFrame, timeScale, loop, false, AnimBlendType_Normal, "", 0.0f);
             _roleAnimStates[role] = { role, url, fps, loop, firstFrame, lastFrame };
             AnimNode::Pointer parent = node->getParent();
             parent->replaceChild(node, clipNode);
@@ -715,7 +715,7 @@ void Rig::reset(const HFMModel& hfmModel) {
     }
 }
 
-bool Rig::jointStatesEmpty() {
+bool Rig::jointStatesEmpty() const {
     return _internalPoseSet._relativePoses.empty();
 }
 
@@ -878,6 +878,20 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
     }
 }
 
+bool Rig::getIsJointOverridden(int jointIndex) const {
+    if (QThread::currentThread() == thread()) {
+        if (isIndexValid(jointIndex)) {
+            return _internalPoseSet._overrideFlags[jointIndex];
+        }
+    } else {
+        QReadLocker readLock(&_externalPoseSetLock);
+        if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._overrideFlags.size()) {
+            return _externalPoseSet._overrideFlags[jointIndex];
+        }
+    }
+    return false;
+}
+
 bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
     bool success { false };
     glm::vec3 originalPosition = position;
@@ -1644,7 +1658,7 @@ void Rig::updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headPos
             _animVars.set("splineIKEnabled", false);
             _animVars.unset("headPosition");
             _animVars.set("headRotation", headPose.rot());
-            _animVars.set("headType", (int)IKTarget::Type::RotationOnly);
+            _animVars.set("headType", (int)IKTarget::Type::Unknown);
         }
     }
 }
@@ -1958,8 +1972,7 @@ void Rig::updateReactions(const ControllerParameters& params) {
 
         bool isSeated = _state == RigRole::Seated;
         bool hipsEnabled = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Enabled;
-        bool hipsEstimated = params.primaryControllerFlags[PrimaryControllerType_Hips] & (uint8_t)ControllerFlags::Estimated;
-        bool hmdMode = hipsEnabled && !hipsEstimated;
+        bool hmdMode = hipsEnabled;
 
         if ((reactionPlaying || isSeated) && !hmdMode) {
             // TODO: make this smooth.
@@ -1973,7 +1986,7 @@ void Rig::updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm
 
     // TODO: does not properly handle avatar scale.
 
-    if (isIndexValid(index)) {
+    if (isIndexValid(index) && !_internalPoseSet._overrideFlags[index]) {
         const glm::mat4 rigToWorld = createMatFromQuatAndPos(modelRotation, modelTranslation);
         const glm::mat4 worldToRig = glm::inverse(rigToWorld);
         const glm::vec3 lookAtVector = glm::normalize(transformPoint(worldToRig, lookAtSpot) - _internalPoseSet._absolutePoses[index].trans());
@@ -2117,7 +2130,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
     _previousIsTalking = params.isTalking;
 
     const float TOTAL_EASE_IN_TIME = 0.75f;
-    const float TOTAL_EASE_OUT_TIME = 1.5f;
+    const float TOTAL_EASE_OUT_TIME = 0.75f;
     if (params.isTalking) {
         if (_talkIdleInterpTime < 1.0f) {
             _talkIdleInterpTime += dt / TOTAL_EASE_IN_TIME;
@@ -2632,3 +2645,8 @@ float Rig::getUnscaledEyeHeight() const {
         return DEFAULT_AVATAR_EYE_HEIGHT;
     }
 }
+
+void Rig::setDirectionalBlending(const QString& targetName, const glm::vec3& blendingTarget, const QString& alphaName, float alpha) {
+    _animVars.set(targetName, blendingTarget);
+    _animVars.set(alphaName, alpha);
+}
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 99794fd0a7..98431e1dca 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -135,7 +135,7 @@ public:
 
     void initJointStates(const HFMModel& hfmModel, const glm::mat4& modelOffset);
     void reset(const HFMModel& hfmModel);
-    bool jointStatesEmpty();
+    bool jointStatesEmpty() const;
     int getJointStateCount() const;
     int indexOfJoint(const QString& jointName) const;
     QString nameOfJoint(int jointIndex) const;
@@ -163,6 +163,8 @@ public:
     void setJointTranslation(int index, bool valid, const glm::vec3& translation, float priority);
     void setJointRotation(int index, bool valid, const glm::quat& rotation, float priority);
 
+    bool getIsJointOverridden(int jointIndex) const;
+
     // if translation and rotation is identity, position will be in rig space
     bool getJointPositionInWorldFrame(int jointIndex, glm::vec3& position,
                                       glm::vec3 translation, glm::quat rotation) const;
@@ -252,6 +254,7 @@ public:
     int getOverrideJointCount() const;
     bool getFlowActive() const;
     bool getNetworkGraphActive() const;
+    void setDirectionalBlending(const QString& targetName, const glm::vec3& blendingTarget, const QString& alphaName, float alpha);
 
 signals:
     void onLoadComplete();
@@ -356,7 +359,7 @@ protected:
             A,
             B
         };
-        NetworkAnimState() : clipNodeEnum(NetworkAnimState::None) {}
+        NetworkAnimState() : clipNodeEnum(NetworkAnimState::None), fps(30.0f), loop(false), firstFrame(0.0f), lastFrame(0.0f), blendTime(FLT_MAX) {}
         NetworkAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
             clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
 
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 6add52141c..5e1f285a6c 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -60,25 +60,13 @@ const int AudioClient::MIN_BUFFER_FRAMES = 1;
 
 const int AudioClient::MAX_BUFFER_FRAMES = 20;
 
-static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 100;
-
 #if defined(Q_OS_ANDROID)
 static const int CHECK_INPUT_READS_MSECS = 2000;
 static const int MIN_READS_TO_CONSIDER_INPUT_ALIVE = 10;
 #endif
 
-static const auto DEFAULT_POSITION_GETTER = []{ return Vectors::ZERO; };
-static const auto DEFAULT_ORIENTATION_GETTER = [] { return Quaternions::IDENTITY; };
-
-static const int DEFAULT_BUFFER_FRAMES = 1;
-
-// OUTPUT_CHANNEL_COUNT is audio pipeline output format, which is always 2 channel.
-// _outputFormat.channelCount() is device output format, which may be 1 or multichannel.
-static const int OUTPUT_CHANNEL_COUNT = 2;
-
-static const bool DEFAULT_STARVE_DETECTION_ENABLED = true;
-static const int STARVE_DETECTION_THRESHOLD = 3;
-static const int STARVE_DETECTION_PERIOD = 10 * 1000; // 10 Seconds
+const AudioClient::AudioPositionGetter  AudioClient::DEFAULT_POSITION_GETTER = []{ return Vectors::ZERO; };
+const AudioClient::AudioOrientationGetter AudioClient::DEFAULT_ORIENTATION_GETTER = [] { return Quaternions::IDENTITY; };
 
 Setting::Handle<bool> dynamicJitterBufferEnabled("dynamicJitterBuffersEnabled",
     InboundAudioStream::DEFAULT_DYNAMIC_JITTER_BUFFER_ENABLED);
@@ -91,11 +79,23 @@ using Lock = std::unique_lock<Mutex>;
 Mutex _deviceMutex;
 Mutex _recordMutex;
 
+HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode);
+
 // thread-safe
-QList<QAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
+QList<HifiAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
     // NOTE: availableDevices() clobbers the Qt internal device list
     Lock lock(_deviceMutex);
-    return QAudioDeviceInfo::availableDevices(mode);
+    auto devices = QAudioDeviceInfo::availableDevices(mode);
+
+    QList<HifiAudioDeviceInfo> newDevices;
+
+    for (auto& device : devices) {
+        newDevices.push_back(HifiAudioDeviceInfo(device, false, mode));
+    }
+    
+    newDevices.push_front(defaultAudioDeviceForMode(mode));
+
+    return newDevices;
 }
 
 // now called from a background thread, to keep blocking operations off the audio thread
@@ -109,6 +109,9 @@ void AudioClient::checkDevices() {
 
     auto inputDevices = getAvailableDevices(QAudio::AudioInput);
     auto outputDevices = getAvailableDevices(QAudio::AudioOutput);
+  
+    QMetaObject::invokeMethod(this, "changeDefault",  Q_ARG(HifiAudioDeviceInfo, inputDevices.first()), Q_ARG(QAudio::Mode, QAudio::AudioInput));
+    QMetaObject::invokeMethod(this, "changeDefault",  Q_ARG(HifiAudioDeviceInfo, outputDevices.first()), Q_ARG(QAudio::Mode, QAudio::AudioOutput));
 
     Lock lock(_deviceMutex);
     if (inputDevices != _inputDevices) {
@@ -122,22 +125,22 @@ void AudioClient::checkDevices() {
     }
 }
 
-QAudioDeviceInfo AudioClient::getActiveAudioDevice(QAudio::Mode mode) const {
+HifiAudioDeviceInfo AudioClient::getActiveAudioDevice(QAudio::Mode mode) const {
     Lock lock(_deviceMutex);
 
     if (mode == QAudio::AudioInput) {
         return _inputDeviceInfo;
-    } else { // if (mode == QAudio::AudioOutput)
+    } else {
         return _outputDeviceInfo;
     }
 }
 
-QList<QAudioDeviceInfo> AudioClient::getAudioDevices(QAudio::Mode mode) const {
+QList<HifiAudioDeviceInfo> AudioClient::getAudioDevices(QAudio::Mode mode) const {
     Lock lock(_deviceMutex);
 
     if (mode == QAudio::AudioInput) {
         return _inputDevices;
-    } else { // if (mode == QAudio::AudioOutput)
+    } else {
         return _outputDevices;
     }
 }
@@ -226,7 +229,7 @@ static float computeLoudness(int16_t* samples, int numSamples) {
 
 template <int NUM_CHANNELS>
 static void applyGainSmoothing(float* buffer, int numFrames, float gain0, float gain1) {
-
+    
     // fast path for unity gain
     if (gain0 == 1.0f && gain1 == 1.0f) {
         return;
@@ -241,7 +244,7 @@ static void applyGainSmoothing(float* buffer, int numFrames, float gain0, float
     float tStep = 1.0f / numFrames;
 
     for (int i = 0; i < numFrames; i++) {
-
+   
         // evaluate poly over t=[0,1)
         float gain = (c3 * t + c2) * t * t + c0;
         t += tStep;
@@ -257,55 +260,7 @@ static inline float convertToFloat(int16_t sample) {
     return (float)sample * (1 / 32768.0f);
 }
 
-AudioClient::AudioClient() :
-    AbstractAudioInterface(),
-    _gate(this),
-    _audioInput(NULL),
-    _dummyAudioInput(NULL),
-    _desiredInputFormat(),
-    _inputFormat(),
-    _numInputCallbackBytes(0),
-    _audioOutput(NULL),
-    _desiredOutputFormat(),
-    _outputFormat(),
-    _outputFrameSize(0),
-    _numOutputCallbackBytes(0),
-    _loopbackAudioOutput(NULL),
-    _loopbackOutputDevice(NULL),
-    _inputRingBuffer(0),
-    _localInjectorsStream(0, 1),
-    _receivedAudioStream(RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES),
-    _isStereoInput(false),
-    _outputStarveDetectionStartTimeMsec(0),
-    _outputStarveDetectionCount(0),
-    _outputBufferSizeFrames("audioOutputBufferFrames", DEFAULT_BUFFER_FRAMES),
-    _sessionOutputBufferSizeFrames(_outputBufferSizeFrames.get()),
-    _outputStarveDetectionEnabled("audioOutputStarveDetectionEnabled", DEFAULT_STARVE_DETECTION_ENABLED),
-    _lastRawInputLoudness(0.0f),
-    _lastSmoothedRawInputLoudness(0.0f),
-    _lastInputLoudness(0.0f),
-    _timeSinceLastClip(-1.0f),
-    _muted(false),
-    _shouldEchoLocally(false),
-    _shouldEchoToServer(false),
-    _isNoiseGateEnabled(true),
-    _isAECEnabled(true),
-    _reverb(false),
-    _reverbOptions(&_scriptReverbOptions),
-    _inputToNetworkResampler(NULL),
-    _networkToOutputResampler(NULL),
-    _localToOutputResampler(NULL),
-    _loopbackResampler(NULL),
-    _audioLimiter(AudioConstants::SAMPLE_RATE, OUTPUT_CHANNEL_COUNT),
-    _outgoingAvatarAudioSequenceNumber(0),
-    _audioOutputIODevice(_localInjectorsStream, _receivedAudioStream, this),
-    _stats(&_receivedAudioStream),
-    _positionGetter(DEFAULT_POSITION_GETTER),
-#if defined(Q_OS_ANDROID)
-    _checkInputTimer(this),
-    _isHeadsetPluggedIn(false),
-#endif
-    _orientationGetter(DEFAULT_ORIENTATION_GETTER) {
+AudioClient::AudioClient() {
 
     // avoid putting a lock in the device callback
     assert(_localSamplesAvailable.is_lock_free());
@@ -321,9 +276,9 @@ AudioClient::AudioClient() :
     }
 
     connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples,
-            this, &AudioClient::processReceivedSamples, Qt::DirectConnection);
-    connect(this, &AudioClient::changeDevice, this, [=](const QAudioDeviceInfo& outputDeviceInfo) {
-        qCDebug(audioclient) << "got AudioClient::changeDevice signal, about to call switchOutputToAudioDevice() outputDeviceInfo: [" << outputDeviceInfo.deviceName() << "]";
+	    this, &AudioClient::processReceivedSamples, Qt::DirectConnection);
+    connect(this, &AudioClient::changeDevice, this, [=](const HifiAudioDeviceInfo& outputDeviceInfo) {
+        qCDebug(audioclient)<< "got AudioClient::changeDevice signal, about to call switchOutputToAudioDevice() outputDeviceInfo: ["<< outputDeviceInfo.deviceName() << "]";
         switchOutputToAudioDevice(outputDeviceInfo);
     });
 
@@ -373,7 +328,7 @@ AudioClient::AudioClient() :
     packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");
 
     auto& domainHandler = nodeList->getDomainHandler();
-    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] {
+    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] { 
         _solo.reset();
     });
     connect(nodeList.data(), &NodeList::nodeActivated, this, [this](SharedNodePointer node) {
@@ -431,15 +386,14 @@ void AudioClient::setAudioPaused(bool pause) {
     }
 }
 
-QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) {
-    QAudioDeviceInfo result;
-    foreach(QAudioDeviceInfo audioDevice, getAvailableDevices(mode)) {
+HifiAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) {
+    HifiAudioDeviceInfo result;
+    foreach (HifiAudioDeviceInfo audioDevice, getAvailableDevices(mode)) {
         if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
             result = audioDevice;
             break;
         }
     }
-
     return result;
 }
 
@@ -487,9 +441,11 @@ QString AudioClient::getWinDeviceName(wchar_t* guid) {
 
 #endif
 
-QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
+HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
+    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(mode);
+    
 #ifdef __APPLE__
-    if (getAvailableDevices(mode).size() > 1) {
+    if (devices.size() > 1) {
         AudioDeviceID defaultDeviceID = 0;
         uint32_t propertySize = sizeof(AudioDeviceID);
         AudioObjectPropertyAddress propertyAddress = {
@@ -519,9 +475,9 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
 
             if (!getPropertyError && propertySize) {
                 // find a device in the list that matches the name we have and return it
-                foreach(QAudioDeviceInfo audioDevice, getAvailableDevices(mode)) {
+                foreach(QAudioDeviceInfo audioDevice, devices){
                     if (audioDevice.deviceName() == CFStringGetCStringPtr(deviceName, kCFStringEncodingMacRoman)) {
-                        return audioDevice;
+                        return HifiAudioDeviceInfo(audioDevice, true, mode);
                     }
                 }
             }
@@ -538,7 +494,9 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             waveInGetDevCaps(WAVE_MAPPER, &wic, sizeof(wic));
             //Use the received manufacturer id to get the device's real name
             waveInGetDevCaps(wic.wMid, &wic, sizeof(wic));
+#if !defined(NDEBUG) 
             qCDebug(audioclient) << "input device:" << wic.szPname;
+#endif
             deviceName = wic.szPname;
         } else {
             WAVEOUTCAPS woc;
@@ -546,7 +504,9 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             waveOutGetDevCaps(WAVE_MAPPER, &woc, sizeof(woc));
             //Use the received manufacturer id to get the device's real name
             waveOutGetDevCaps(woc.wMid, &woc, sizeof(woc));
+#if !defined(NDEBUG) 
             qCDebug(audioclient) << "output device:" << woc.szPname;
+#endif
             deviceName = woc.szPname;
         }
     } else {
@@ -569,10 +529,18 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
         CoUninitialize();
     }
 
-    qCDebug(audioclient) << "defaultAudioDeviceForMode mode: " << (mode == QAudio::AudioOutput ? "Output" : "Input")
-        << " [" << deviceName << "] [" << getNamedAudioDeviceForMode(mode, deviceName).deviceName() << "]";
-
-    return getNamedAudioDeviceForMode(mode, deviceName);
+    HifiAudioDeviceInfo foundDevice;
+    foreach(QAudioDeviceInfo audioDevice, devices) {
+        if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
+            foundDevice=HifiAudioDeviceInfo(audioDevice,true,mode);
+            break;
+        }
+    }
+#if !defined(NDEBUG) 
+    qCDebug(audioclient) << "defaultAudioDeviceForMode mode: " << (mode == QAudio::AudioOutput ? "Output" : "Input") 
+	<< " [" << deviceName << "] [" << foundDevice.deviceName() << "]";
+#endif
+    return foundDevice;
 #endif
 
 #if defined (Q_OS_ANDROID)
@@ -580,18 +548,18 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
         Setting::Handle<bool> enableAEC(SETTING_AEC_KEY, DEFAULT_AEC_ENABLED);
         bool aecEnabled = enableAEC.get();
         auto audioClient = DependencyManager::get<AudioClient>();
-        bool headsetOn = audioClient? audioClient->isHeadsetPluggedIn() : false;
-        auto inputDevices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
-        for (auto inputDevice : inputDevices) {
+        bool headsetOn = audioClient ? audioClient->isHeadsetPluggedIn() : false;
+        for (QAudioDeviceInfo inputDevice : devices) {
             if (((headsetOn || !aecEnabled) && inputDevice.deviceName() == VOICE_RECOGNITION) ||
-                    ((!headsetOn && aecEnabled) && inputDevice.deviceName() == VOICE_COMMUNICATION)) {
-                return inputDevice;
+                   ((!headsetOn && aecEnabled) && inputDevice.deviceName() == VOICE_COMMUNICATION)) {
+                return HifiAudioDeviceInfo(inputDevice, false, QAudio::AudioInput); 
             }
         }
     }
 #endif
     // fallback for failed lookup is the default device
-    return (mode == QAudio::AudioInput) ? QAudioDeviceInfo::defaultInputDevice() : QAudioDeviceInfo::defaultOutputDevice();
+    return (mode == QAudio::AudioInput) ? HifiAudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice(), true,mode) : 
+        HifiAudioDeviceInfo(QAudioDeviceInfo::defaultOutputDevice(), true, mode);
 }
 
 bool AudioClient::getNamedAudioDeviceForModeExists(QAudio::Mode mode, const QString& deviceName) {
@@ -643,29 +611,29 @@ bool adjustedFormatForAudioDevice(const QAudioDeviceInfo& audioDevice,
     if (IsWindows8OrGreater()) {
         // On Windows using WASAPI shared-mode, returns the internal mix format
         return nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat);
-    }   // else enumerate formats
+    }  // else enumerate formats
 #endif
-    
+
 #if defined(Q_OS_MAC)
     // Mac OSX returns the preferred CoreAudio format
     return nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat);
 #endif
-    
+
 #if defined(Q_OS_ANDROID)
     // As of Qt5.6, Android returns the native OpenSLES sample rate when possible, else 48000
     if (nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat)) {
         return true;
-    }   // else enumerate formats
+    }  // else enumerate formats
 #endif
-    
+
     adjustedAudioFormat = desiredAudioFormat;
 
     //
     // Attempt the device sample rate and channel count in decreasing order of preference.
     //
     const int sampleRates[] = { 48000, 44100, 32000, 24000, 16000, 96000, 192000, 88200, 176400 };
-    const int inputChannels[] = { 1, 2, 4, 6, 8 };  // prefer mono
-    const int outputChannels[] = { 2, 4, 6, 8, 1 }; // prefer stereo, downmix as last resort
+    const int inputChannels[] = { 1, 2, 4, 6, 8 };   // prefer mono
+    const int outputChannels[] = { 2, 4, 6, 8, 1 };  // prefer stereo, downmix as last resort
 
     for (int channelCount : (desiredAudioFormat.channelCount() == 1 ? inputChannels : outputChannels)) {
         for (int sampleRate : sampleRates) {
@@ -758,22 +726,22 @@ void AudioClient::start() {
     _desiredOutputFormat = _desiredInputFormat;
     _desiredOutputFormat.setChannelCount(OUTPUT_CHANNEL_COUNT);
 
-    QAudioDeviceInfo inputDeviceInfo = defaultAudioDeviceForMode(QAudio::AudioInput);
+    HifiAudioDeviceInfo inputDeviceInfo = defaultAudioDeviceForMode(QAudio::AudioInput);
     qCDebug(audioclient) << "The default audio input device is" << inputDeviceInfo.deviceName();
     bool inputFormatSupported = switchInputToAudioDevice(inputDeviceInfo);
 
-    QAudioDeviceInfo outputDeviceInfo = defaultAudioDeviceForMode(QAudio::AudioOutput);
+    HifiAudioDeviceInfo outputDeviceInfo = defaultAudioDeviceForMode(QAudio::AudioOutput);
     qCDebug(audioclient) << "The default audio output device is" << outputDeviceInfo.deviceName();
     bool outputFormatSupported = switchOutputToAudioDevice(outputDeviceInfo);
 
     if (!inputFormatSupported) {
         qCDebug(audioclient) << "Unable to set up audio input because of a problem with input format.";
-        qCDebug(audioclient) << "The closest format available is" << inputDeviceInfo.nearestFormat(_desiredInputFormat);
+        qCDebug(audioclient) << "The closest format available is" << inputDeviceInfo.getDevice().nearestFormat(_desiredInputFormat);
     }
 
     if (!outputFormatSupported) {
         qCDebug(audioclient) << "Unable to set up audio output because of a problem with output format.";
-        qCDebug(audioclient) << "The closest format available is" << outputDeviceInfo.nearestFormat(_desiredOutputFormat);
+        qCDebug(audioclient) << "The closest format available is" << outputDeviceInfo.getDevice().nearestFormat(_desiredOutputFormat);
     }
 #if defined(Q_OS_ANDROID)
     connect(&_checkInputTimer, &QTimer::timeout, this, &AudioClient::checkInputTimeout);
@@ -783,10 +751,10 @@ void AudioClient::start() {
 
 void AudioClient::stop() {
     qCDebug(audioclient) << "AudioClient::stop(), requesting switchInputToAudioDevice() to shut down";
-    switchInputToAudioDevice(QAudioDeviceInfo(), true);
+    switchInputToAudioDevice(HifiAudioDeviceInfo(), true);
 
     qCDebug(audioclient) << "AudioClient::stop(), requesting switchOutputToAudioDevice() to shut down";
-    switchOutputToAudioDevice(QAudioDeviceInfo(), true);
+    switchOutputToAudioDevice(HifiAudioDeviceInfo(), true);
 
     // Stop triggering the checks
     QObject::disconnect(_checkPeakValuesTimer, &QTimer::timeout, nullptr, nullptr);
@@ -978,16 +946,18 @@ void AudioClient::selectAudioFormat(const QString& selectedCodecName) {
 
 }
 
-bool AudioClient::switchAudioDevice(QAudio::Mode mode, const QAudioDeviceInfo& deviceInfo) {
-    auto device = deviceInfo;
-
-    if (device.isNull()) {
-        device = defaultAudioDeviceForMode(mode);
+void AudioClient::changeDefault(HifiAudioDeviceInfo newDefault, QAudio::Mode mode) {
+    HifiAudioDeviceInfo currentDevice = mode == QAudio::AudioInput ? _inputDeviceInfo : _outputDeviceInfo;
+    if (currentDevice.isDefault() && currentDevice.getDevice() != newDefault.getDevice()) {
+        switchAudioDevice(mode, newDefault);
     }
+}
 
+bool AudioClient::switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo& deviceInfo) {
+    auto device = deviceInfo;
     if (mode == QAudio::AudioInput) {
         return switchInputToAudioDevice(device);
-    } else { // if (mode == QAudio::AudioOutput)
+    } else {
         return switchOutputToAudioDevice(device);
     }
 }
@@ -1030,7 +1000,7 @@ void AudioClient::configureReverb() {
     p.wetDryMix = 100.0f;
     p.preDelay = 0.0f;
     p.earlyGain = -96.0f;   // disable ER
-    p.lateGain += _reverbOptions->getWetDryMix() * (24.0f/100.0f) - 24.0f;  // -0dB to -24dB, based on wetDryMix
+    p.lateGain += _reverbOptions->getWetDryMix() * (24.0f / 100.0f) - 24.0f;  // -0dB to -24dB, based on wetDryMix
     p.lateMixLeft = 0.0f;
     p.lateMixRight = 0.0f;
 
@@ -1414,7 +1384,7 @@ void AudioClient::handleMicAudioInput() {
         } else if (_timeSinceLastClip >= 0.0f) {
             _timeSinceLastClip += AudioConstants::NETWORK_FRAME_SECS;
         }
-        isClipping = (_timeSinceLastClip >= 0.0f) && (_timeSinceLastClip < 2.0f);   // 2 second hold time
+        isClipping = (_timeSinceLastClip >= 0.0f) && (_timeSinceLastClip < 2.0f);  // 2 second hold time
 
 #if defined(WEBRTC_ENABLED)
         if (_isAECEnabled) {
@@ -1453,7 +1423,7 @@ void AudioClient::handleDummyAudioInput() {
         ? AudioConstants::NETWORK_FRAME_BYTES_STEREO
         : AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL;
 
-    QByteArray audioBuffer(numNetworkBytes, 0); // silent
+    QByteArray audioBuffer(numNetworkBytes, 0);  // silent
     handleAudioInput(audioBuffer);
 }
 
@@ -1598,7 +1568,7 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
                     // direct mix into mixBuffer
                     injector->getLocalHRTF().mixStereo(_localScratchBuffer, mixBuffer, gain,
                                                        AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
-                } else {    // injector is mono
+                } else {  // injector is mono
 
                     if (options.positionSet) {
 
@@ -1736,7 +1706,7 @@ void AudioClient::setAcousticEchoCancellation(bool enable, bool emitSignal) {
 
 bool AudioClient::setIsStereoInput(bool isStereoInput) {
     bool stereoInputChanged = false;
-    if (isStereoInput != _isStereoInput && _inputDeviceInfo.supportedChannelCounts().contains(2)) {
+    if (isStereoInput != _isStereoInput && _inputDeviceInfo.getDevice().supportedChannelCounts().contains(2)) {
         _isStereoInput = isStereoInput;
         stereoInputChanged = true;
 
@@ -1798,17 +1768,17 @@ void AudioClient::outputFormatChanged() {
     _receivedAudioStream.outputFormatChanged(_outputFormat.sampleRate(), OUTPUT_CHANNEL_COUNT);
 }
 
-bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInfo, bool isShutdownRequest) {
+bool AudioClient::switchInputToAudioDevice(const HifiAudioDeviceInfo inputDeviceInfo, bool isShutdownRequest) {
     Q_ASSERT_X(QThread::currentThread() == thread(), Q_FUNC_INFO, "Function invoked on wrong thread");
 
-    qCDebug(audioclient) << __FUNCTION__ << "inputDeviceInfo: [" << inputDeviceInfo.deviceName() << "]";
+    qCDebug(audioclient) << __FUNCTION__ << "inputDeviceInfo: [" << _inputDeviceInfo.deviceName() <<"----"<<inputDeviceInfo.getDevice().deviceName() << "]";
     bool supportedFormat = false;
 
     // NOTE: device start() uses the Qt internal device list
     Lock lock(_deviceMutex);
 
 #if defined(Q_OS_ANDROID)
-    _shouldRestartInputSetup = false; // avoid a double call to _audioInput->start() from audioInputStateChanged
+    _shouldRestartInputSetup = false;  // avoid a double call to _audioInput->start() from audioInputStateChanged
 #endif
 
     // cleanup any previously initialized device
@@ -1822,8 +1792,6 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInf
         _audioInput->deleteLater();
         _audioInput = NULL;
         _numInputCallbackBytes = 0;
-
-        _inputDeviceInfo = QAudioDeviceInfo();
     }
 
     if (_dummyAudioInput) {
@@ -1854,12 +1822,16 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInf
         return true;
     }
 
-    if (!inputDeviceInfo.isNull()) {
+    if (!inputDeviceInfo.getDevice().isNull()) {
         qCDebug(audioclient) << "The audio input device " << inputDeviceInfo.deviceName() << "is available.";
+      
+        bool doEmit = _inputDeviceInfo.deviceName() != inputDeviceInfo.deviceName();
         _inputDeviceInfo = inputDeviceInfo;
-        emit deviceChanged(QAudio::AudioInput, inputDeviceInfo);
+        if (doEmit) {
+            emit deviceChanged(QAudio::AudioInput, _inputDeviceInfo);
+        }
 
-        if (adjustedFormatForAudioDevice(inputDeviceInfo, _desiredInputFormat, _inputFormat)) {
+        if (adjustedFormatForAudioDevice(_inputDeviceInfo.getDevice(), _desiredInputFormat, _inputFormat)) {
             qCDebug(audioclient) << "The format to be used for audio input is" << _inputFormat;
 
             // we've got the best we can get for input
@@ -1884,7 +1856,7 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInf
 
             // if the user wants stereo but this device can't provide then bail
             if (!_isStereoInput || _inputFormat.channelCount() == 2) {
-                _audioInput = new QAudioInput(inputDeviceInfo, _inputFormat, this);
+                _audioInput = new QAudioInput(_inputDeviceInfo.getDevice(), _inputFormat, this);
                 _numInputCallbackBytes = calculateNumberOfInputCallbackBytes(_inputFormat);
                 _audioInput->setBufferSize(_numInputCallbackBytes);
                 // different audio input devices may have different volumes
@@ -1906,7 +1878,7 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInf
                     connect(_inputDevice, SIGNAL(readyRead()), this, SLOT(handleMicAudioInput()));
                     supportedFormat = true;
                 } else {
-                    qCDebug(audioclient) << "Error starting audio input -" <<  _audioInput->error();
+                    qCDebug(audioclient) << "Error starting audio input -" << _audioInput->error();
                     _audioInput->deleteLater();
                     _audioInput = NULL;
                 }
@@ -1919,7 +1891,7 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInf
     // This enables clients without a mic to still receive an audio stream from the mixer.
     if (!_audioInput) {
         qCDebug(audioclient) << "Audio input device is not available, using dummy input.";
-        _inputDeviceInfo = QAudioDeviceInfo();
+        _inputDeviceInfo.setDevice(QAudioDeviceInfo());
         emit deviceChanged(QAudio::AudioInput, _inputDeviceInfo);
 
         _inputFormat = _desiredInputFormat;
@@ -1975,11 +1947,11 @@ void AudioClient::checkInputTimeout() {
 
 void AudioClient::setHeadsetPluggedIn(bool pluggedIn) {
 #if defined(Q_OS_ANDROID)
-    if (pluggedIn == !_isHeadsetPluggedIn && !_inputDeviceInfo.isNull()) {
-        QAndroidJniObject brand =  QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND");
+    if (pluggedIn == !_isHeadsetPluggedIn && !_inputDeviceInfo.getDevice().isNull()) {
+        QAndroidJniObject brand = QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND");
         // some samsung phones needs more time to shutdown the previous input device
         if (brand.toString().contains("samsung", Qt::CaseInsensitive)) {
-            switchInputToAudioDevice(QAudioDeviceInfo(), true);
+            switchInputToAudioDevice(HifiAudioDeviceInfo(), true);
             QThread::msleep(200);
         }
 
@@ -2026,7 +1998,7 @@ void AudioClient::outputNotify() {
     }
 }
 
-bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceInfo, bool isShutdownRequest) {
+bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDeviceInfo, bool isShutdownRequest) {
     Q_ASSERT_X(QThread::currentThread() == thread(), Q_FUNC_INFO, "Function invoked on wrong thread");
 
     qCDebug(audioclient) << "AudioClient::switchOutputToAudioDevice() outputDeviceInfo: [" << outputDeviceInfo.deviceName() << "]";
@@ -2061,8 +2033,6 @@ bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceI
 
         delete[] _localOutputMixBuffer;
         _localOutputMixBuffer = NULL;
-
-        _outputDeviceInfo = QAudioDeviceInfo();
     }
 
     // cleanup any resamplers
@@ -2086,12 +2056,15 @@ bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceI
         return true;
     }
 
-    if (!outputDeviceInfo.isNull()) {
+    if (!outputDeviceInfo.getDevice().isNull()) {
         qCDebug(audioclient) << "The audio output device " << outputDeviceInfo.deviceName() << "is available.";
+        bool doEmit = _outputDeviceInfo.deviceName() != outputDeviceInfo.deviceName();
         _outputDeviceInfo = outputDeviceInfo;
-        emit deviceChanged(QAudio::AudioOutput, outputDeviceInfo);
+        if (doEmit) {
+            emit deviceChanged(QAudio::AudioOutput, _outputDeviceInfo);
+        }
 
-        if (adjustedFormatForAudioDevice(outputDeviceInfo, _desiredOutputFormat, _outputFormat)) {
+        if (adjustedFormatForAudioDevice(_outputDeviceInfo.getDevice(), _desiredOutputFormat, _outputFormat)) {
             qCDebug(audioclient) << "The format to be used for audio output is" << _outputFormat;
 
             // we've got the best we can get for input
@@ -2113,7 +2086,7 @@ bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceI
             outputFormatChanged();
 
             // setup our general output device for audio-mixer audio
-            _audioOutput = new QAudioOutput(outputDeviceInfo, _outputFormat, this);
+            _audioOutput = new QAudioOutput(_outputDeviceInfo.getDevice(), _outputFormat, this);
 
             int deviceChannelCount = _outputFormat.channelCount();
             int frameSize = (AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL * deviceChannelCount * _outputFormat.sampleRate()) / _desiredOutputFormat.sampleRate();
@@ -2165,7 +2138,7 @@ bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceI
             localAudioLock.unlock();
 
             // setup a loopback audio output device
-            _loopbackAudioOutput = new QAudioOutput(outputDeviceInfo, _outputFormat, this);
+            _loopbackAudioOutput = new QAudioOutput(outputDeviceInfo.getDevice(), _outputFormat, this);
 
             _timeSinceLastReceived.start();
 
@@ -2239,7 +2212,7 @@ float AudioClient::azimuthForSource(const glm::vec3& relativePosition) {
 
         // produce an oriented angle about the y-axis
         glm::vec3 direction = rotatedSourcePosition * (1.0f / fastSqrtf(rotatedSourcePositionLength2));
-        float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
+        float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f));  // UNIT_NEG_Z is "forward"
         return (direction.x < 0.0f) ? -angle : angle;
 
     } else {
@@ -2423,4 +2396,4 @@ void AudioClient::setInputVolume(float volume, bool emitSignal) {
             emit inputVolumeChanged(_audioInput->volume());
         }
     }
-}
+}
\ No newline at end of file
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index ab12393ebf..28a4f23968 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -53,6 +53,7 @@
 
 #include "AudioIOStats.h"
 #include "AudioFileWav.h"
+#include "HifiAudioDeviceInfo.h"
 
 #ifdef _WIN32
 #pragma warning( push )
@@ -79,6 +80,9 @@ class QIODevice;
 class Transform;
 class NLPacket;
 
+#define DEFAULT_STARVE_DETECTION_ENABLED true
+#define DEFAULT_BUFFER_FRAMES 1
+
 class AudioClient : public AbstractAudioInterface, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
@@ -102,8 +106,8 @@ public:
             _audio(audio), _unfulfilledReads(0) {}
 
         void start() { open(QIODevice::ReadOnly | QIODevice::Unbuffered); }
-        qint64 readData(char * data, qint64 maxSize) override;
-        qint64 writeData(const char * data, qint64 maxSize) override { return 0; }
+        qint64 readData(char* data, qint64 maxSize) override;
+        qint64 writeData(const char* data, qint64 maxSize) override { return 0; }
         int getRecentUnfulfilledReads() { int unfulfilledReads = _unfulfilledReads; _unfulfilledReads = 0; return unfulfilledReads; }
     private:
         LocalInjectorsStream& _localInjectorsStream;
@@ -111,7 +115,7 @@ public:
         AudioClient* _audio;
         int _unfulfilledReads;
     };
-
+    
     void startThread();
     void negotiateAudioFormat();
     void selectAudioFormat(const QString& selectedCodecName);
@@ -152,12 +156,12 @@ public:
     void setIsPlayingBackRecording(bool isPlayingBackRecording) { _isPlayingBackRecording = isPlayingBackRecording; }
 
     Q_INVOKABLE void setAvatarBoundingBoxParameters(glm::vec3 corner, glm::vec3 scale);
-    
+
     bool outputLocalInjector(const AudioInjectorPointer& injector) override;
 
-    QAudioDeviceInfo getActiveAudioDevice(QAudio::Mode mode) const;
-    QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
-
+    HifiAudioDeviceInfo getActiveAudioDevice(QAudio::Mode mode) const;
+    QList<HifiAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
+  
     void enablePeakValues(bool enable) { _enablePeakValues = enable; }
     bool peakValuesAvailable() const;
 
@@ -233,11 +237,11 @@ public slots:
     int setOutputBufferSize(int numFrames, bool persist = true);
 
     bool shouldLoopbackInjectors() override { return _shouldEchoToServer; }
+    Q_INVOKABLE void changeDefault(HifiAudioDeviceInfo newDefault, QAudio::Mode mode);
 
     // calling with a null QAudioDevice will use the system default
-    bool switchAudioDevice(QAudio::Mode mode, const QAudioDeviceInfo& deviceInfo = QAudioDeviceInfo());
+    bool switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo& deviceInfo = HifiAudioDeviceInfo());
     bool switchAudioDevice(QAudio::Mode mode, const QString& deviceName);
-
     // Qt opensles plugin is not able to detect when the headset is plugged in
     void setHeadsetPluggedIn(bool pluggedIn);
 
@@ -269,10 +273,10 @@ signals:
     void noiseGateOpened();
     void noiseGateClosed();
 
-    void changeDevice(const QAudioDeviceInfo& outputDeviceInfo);
+    void changeDevice(const HifiAudioDeviceInfo& outputDeviceInfo);
 
-    void deviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device);
-    void devicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices);
+    void deviceChanged(QAudio::Mode mode, const HifiAudioDeviceInfo& device);
+    void devicesChanged(QAudio::Mode mode, const QList<HifiAudioDeviceInfo>& devices);
     void peakValueListChanged(const QList<float> peakValueList);
 
     void receivedFirstPacket();
@@ -291,6 +295,16 @@ protected:
     virtual void customDeleter() override;
 
 private:
+    static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES{ 100 };
+    // OUTPUT_CHANNEL_COUNT is audio pipeline output format, which is always 2 channel.
+    // _outputFormat.channelCount() is device output format, which may be 1 or multichannel.
+    static const int OUTPUT_CHANNEL_COUNT{ 2 };
+    static const int STARVE_DETECTION_THRESHOLD{ 3 };
+    static const int STARVE_DETECTION_PERIOD{ 10 * 1000 }; // 10 Seconds
+
+    static const AudioPositionGetter DEFAULT_POSITION_GETTER;
+    static const AudioOrientationGetter DEFAULT_ORIENTATION_GETTER;
+
     friend class CheckDevicesThread;
     friend class LocalInjectorsThread;
 
@@ -306,9 +320,9 @@ private:
     float gainForSource(float distance, float volume);
 
 #ifdef Q_OS_ANDROID
-    QTimer _checkInputTimer;
+    QTimer _checkInputTimer{ this };
     long _inputReadsSinceLastCheck = 0l;
-    bool _isHeadsetPluggedIn;
+    bool _isHeadsetPluggedIn { false };
 #endif
 
     class Gate {
@@ -335,68 +349,68 @@ private:
         bool _isSimulatingJitter{ false };
     };
 
-    Gate _gate;
+    Gate _gate{ this };
 
     Mutex _injectorsMutex;
-    QAudioInput* _audioInput;
-    QTimer* _dummyAudioInput;
+    QAudioInput* _audioInput{ nullptr };
+    QTimer* _dummyAudioInput{ nullptr };
     QAudioFormat _desiredInputFormat;
     QAudioFormat _inputFormat;
-    QIODevice* _inputDevice;
-    int _numInputCallbackBytes;
-    QAudioOutput* _audioOutput;
+    QIODevice* _inputDevice{ nullptr };
+    int _numInputCallbackBytes{ 0 };
+    QAudioOutput* _audioOutput{ nullptr };
     std::atomic<bool> _audioOutputInitialized { false };
     QAudioFormat _desiredOutputFormat;
     QAudioFormat _outputFormat;
-    int _outputFrameSize;
-    int _numOutputCallbackBytes;
-    QAudioOutput* _loopbackAudioOutput;
-    QIODevice* _loopbackOutputDevice;
-    AudioRingBuffer _inputRingBuffer;
-    LocalInjectorsStream _localInjectorsStream;
+    int _outputFrameSize{ 0 };
+    int _numOutputCallbackBytes{ 0 };
+    QAudioOutput* _loopbackAudioOutput{ nullptr };
+    QIODevice* _loopbackOutputDevice{ nullptr };
+    AudioRingBuffer _inputRingBuffer{ 0 };
+    LocalInjectorsStream _localInjectorsStream{ 0 , 1 };
     // In order to use _localInjectorsStream as a lock-free pipe,
     // use it with a single producer/consumer, and track available samples and injectors
     std::atomic<int> _localSamplesAvailable { 0 };
     std::atomic<bool> _localInjectorsAvailable { false };
-    MixedProcessedAudioStream _receivedAudioStream;
-    bool _isStereoInput;
+    MixedProcessedAudioStream _receivedAudioStream{ RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES };
+    bool _isStereoInput{ false };
     std::atomic<bool> _enablePeakValues { false };
 
-    quint64 _outputStarveDetectionStartTimeMsec;
-    int _outputStarveDetectionCount;
+    quint64 _outputStarveDetectionStartTimeMsec{ 0 };
+    int _outputStarveDetectionCount { 0 };
 
-    Setting::Handle<int> _outputBufferSizeFrames;
-    int _sessionOutputBufferSizeFrames;
-    Setting::Handle<bool> _outputStarveDetectionEnabled;
+    Setting::Handle<int> _outputBufferSizeFrames{"audioOutputBufferFrames", DEFAULT_BUFFER_FRAMES};
+    int _sessionOutputBufferSizeFrames{ _outputBufferSizeFrames.get() };
+    Setting::Handle<bool> _outputStarveDetectionEnabled{ "audioOutputStarveDetectionEnabled", DEFAULT_STARVE_DETECTION_ENABLED};
 
     StDev _stdev;
     QElapsedTimer _timeSinceLastReceived;
-    float _lastRawInputLoudness;    // before mute/gate
-    float _lastSmoothedRawInputLoudness;
-    float _lastInputLoudness;       // after mute/gate
-    float _timeSinceLastClip;
+    float _lastRawInputLoudness{ 0.0f };    // before mute/gate
+    float _lastSmoothedRawInputLoudness{ 0.0f };
+    float _lastInputLoudness{ 0.0f };       // after mute/gate
+    float _timeSinceLastClip{ -1.0f };
     int _totalInputAudioSamples;
 
-    bool _muted;
-    bool _shouldEchoLocally;
-    bool _shouldEchoToServer;
-    bool _isNoiseGateEnabled;
+    bool _muted{ false };
+    bool _shouldEchoLocally{ false };
+    bool _shouldEchoToServer{ false };
+    bool _isNoiseGateEnabled{ true };
     bool _warnWhenMuted;
-    bool _isAECEnabled;
+    bool _isAECEnabled{ true };
 
-    bool _reverb;
+    bool _reverb{ false };
     AudioEffectOptions _scriptReverbOptions;
     AudioEffectOptions _zoneReverbOptions;
-    AudioEffectOptions* _reverbOptions;
+    AudioEffectOptions* _reverbOptions{ &_scriptReverbOptions };
     AudioReverb _sourceReverb { AudioConstants::SAMPLE_RATE };
     AudioReverb _listenerReverb { AudioConstants::SAMPLE_RATE };
     AudioReverb _localReverb { AudioConstants::SAMPLE_RATE };
 
     // possible streams needed for resample
-    AudioSRC* _inputToNetworkResampler;
-    AudioSRC* _networkToOutputResampler;
-    AudioSRC* _localToOutputResampler;
-    AudioSRC* _loopbackResampler;
+    AudioSRC* _inputToNetworkResampler{ nullptr };
+    AudioSRC* _networkToOutputResampler{ nullptr };
+    AudioSRC* _localToOutputResampler{ nullptr };
+    AudioSRC* _loopbackResampler{ nullptr };
 
     // for network audio (used by network audio thread)
     int16_t _networkScratchBuffer[AudioConstants::NETWORK_FRAME_SAMPLES_AMBISONIC];
@@ -415,8 +429,8 @@ private:
     int16_t _localScratchBuffer[AudioConstants::NETWORK_FRAME_SAMPLES_AMBISONIC];
     float* _localOutputMixBuffer { NULL };
     Mutex _localAudioMutex;
-    AudioLimiter _audioLimiter;
-    
+    AudioLimiter _audioLimiter{ AudioConstants::SAMPLE_RATE, OUTPUT_CHANNEL_COUNT };
+
     // Adds Reverb
     void configureReverb();
     void updateReverbOptions();
@@ -437,33 +451,33 @@ private:
     void processWebrtcNearEnd(int16_t* samples, int numFrames, int numChannels, int sampleRate);
 #endif
 
-    bool switchInputToAudioDevice(const QAudioDeviceInfo inputDeviceInfo, bool isShutdownRequest = false);
-    bool switchOutputToAudioDevice(const QAudioDeviceInfo outputDeviceInfo, bool isShutdownRequest = false);
+    bool switchInputToAudioDevice(const HifiAudioDeviceInfo inputDeviceInfo, bool isShutdownRequest = false);
+    bool switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDeviceInfo, bool isShutdownRequest = false);
 
     // Callback acceleration dependent calculations
     int calculateNumberOfInputCallbackBytes(const QAudioFormat& format) const;
     int calculateNumberOfFrameSamples(int numBytes) const;
 
-    quint16 _outgoingAvatarAudioSequenceNumber;
+    quint16 _outgoingAvatarAudioSequenceNumber{ 0 };
 
-    AudioOutputIODevice _audioOutputIODevice;
+    AudioOutputIODevice _audioOutputIODevice{ _localInjectorsStream, _receivedAudioStream, this };
 
-    AudioIOStats _stats;
+    AudioIOStats _stats{ &_receivedAudioStream };
 
     AudioGate* _audioGate { nullptr };
     bool _audioGateOpen { true };
 
-    AudioPositionGetter _positionGetter;
-    AudioOrientationGetter _orientationGetter;
+    AudioPositionGetter _positionGetter{ DEFAULT_POSITION_GETTER };
+    AudioOrientationGetter _orientationGetter{ DEFAULT_ORIENTATION_GETTER };
 
     glm::vec3 avatarBoundingBoxCorner;
     glm::vec3 avatarBoundingBoxScale;
 
-    QAudioDeviceInfo _inputDeviceInfo;
-    QAudioDeviceInfo _outputDeviceInfo;
+    HifiAudioDeviceInfo _inputDeviceInfo;
+    HifiAudioDeviceInfo _outputDeviceInfo;
 
-    QList<QAudioDeviceInfo> _inputDevices;
-    QList<QAudioDeviceInfo> _outputDevices;
+    QList<HifiAudioDeviceInfo> _inputDevices;
+    QList<HifiAudioDeviceInfo> _outputDevices;
 
     AudioFileWav _audioFileWav;
 
@@ -476,7 +490,7 @@ private:
 
     CodecPluginPointer _codec;
     QString _selectedCodecName;
-    Encoder* _encoder { nullptr }; // for outbound mic stream
+    Encoder* _encoder { nullptr };  // for outbound mic stream
 
     RateCounter<> _silentOutbound;
     RateCounter<> _audioOutbound;
@@ -484,11 +498,11 @@ private:
     RateCounter<> _audioInbound;
 
 #if defined(Q_OS_ANDROID)
-    bool _shouldRestartInputSetup { true }; // Should we restart the input device because of an unintended stop?
+    bool _shouldRestartInputSetup { true };  // Should we restart the input device because of an unintended stop?
 #endif
 
     AudioSolo _solo;
-    
+
     Mutex _checkDevicesMutex;
     QTimer* _checkDevicesTimer { nullptr };
     Mutex _checkPeakValuesMutex;
@@ -498,4 +512,4 @@ private:
 };
 
 
-#endif // hifi_AudioClient_h
+#endif // hifi_AudioClient_h
\ No newline at end of file
diff --git a/libraries/audio-client/src/HifiAudioDeviceInfo.cpp b/libraries/audio-client/src/HifiAudioDeviceInfo.cpp
new file mode 100644
index 0000000000..6e2d5fbe92
--- /dev/null
+++ b/libraries/audio-client/src/HifiAudioDeviceInfo.cpp
@@ -0,0 +1,36 @@
+//
+//  HifiAudioDeviceInfo.cpp
+//  libraries/audio-client/src
+//
+//  Created by Amer Cerkic on 9/14/19.
+//  Copyright 2019 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 "HifiAudioDeviceInfo.h"
+
+const QString HifiAudioDeviceInfo::DEFAULT_DEVICE_NAME = "default ";
+
+void HifiAudioDeviceInfo::setDevice(QAudioDeviceInfo devInfo) {
+    _audioDeviceInfo = devInfo;
+}
+
+HifiAudioDeviceInfo& HifiAudioDeviceInfo::operator=(const HifiAudioDeviceInfo& other) {
+    _audioDeviceInfo = other.getDevice();
+    _mode = other.getMode();
+    _isDefault = other.isDefault();
+    return *this;
+}
+
+
+bool HifiAudioDeviceInfo::operator==(const HifiAudioDeviceInfo& rhs) const {
+    //Does the QAudioDeviceinfo match as well as is this the default device or 
+    return  getDevice() == rhs.getDevice() && isDefault() == rhs.isDefault();
+}
+bool HifiAudioDeviceInfo::operator!=(const HifiAudioDeviceInfo& rhs) const {
+    return  getDevice() != rhs.getDevice() || isDefault() != rhs.isDefault();
+}
+
diff --git a/libraries/audio-client/src/HifiAudioDeviceInfo.h b/libraries/audio-client/src/HifiAudioDeviceInfo.h
new file mode 100644
index 0000000000..99520f1643
--- /dev/null
+++ b/libraries/audio-client/src/HifiAudioDeviceInfo.h
@@ -0,0 +1,69 @@
+//
+//  HifiAudioDeviceInfo.h
+//  libraries/audio-client/src
+//
+//  Created by Amer Cerkic on 9/14/19.
+//  Copyright 2019 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
+//
+
+#pragma once
+#ifndef hifi_audiodeviceinfo_h
+#define hifi_audiodeviceinfo_h
+
+
+#include <QObject>
+#include <QAudioDeviceInfo>
+#include <QAudio>
+#include <QString>
+
+class HifiAudioDeviceInfo : public QObject {
+    Q_OBJECT
+    
+public:
+    HifiAudioDeviceInfo() : QObject() {}
+    HifiAudioDeviceInfo(const HifiAudioDeviceInfo &deviceInfo) : QObject(){
+        _audioDeviceInfo = deviceInfo.getDevice();
+        _mode = deviceInfo.getMode();
+        _isDefault = deviceInfo.isDefault();
+    }
+
+    HifiAudioDeviceInfo(QAudioDeviceInfo deviceInfo, bool isDefault, QAudio::Mode mode) :
+        _audioDeviceInfo(deviceInfo),
+        _isDefault(isDefault),
+        _mode(mode){
+    }
+
+    void setMode(QAudio::Mode mode) { _mode = mode; }
+    void setIsDefault() { _isDefault = true; }
+    void setDevice(QAudioDeviceInfo devInfo);
+    QString deviceName() const {
+#if defined(Q_OS_ANDROID)
+        return _audioDeviceInfo.deviceName();
+#endif
+        if (_isDefault) {
+            return DEFAULT_DEVICE_NAME;
+        } else {
+            return _audioDeviceInfo.deviceName();
+        }
+    }
+    QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; }
+    bool isDefault() const { return _isDefault; }
+    QAudio::Mode getMode() const { return _mode; }
+
+    HifiAudioDeviceInfo& operator=(const HifiAudioDeviceInfo& other);
+    bool operator==(const HifiAudioDeviceInfo& rhs) const;
+    bool operator!=(const HifiAudioDeviceInfo& rhs) const;
+
+private:
+    QAudioDeviceInfo _audioDeviceInfo;
+    bool _isDefault { false };
+    QAudio::Mode _mode { QAudio::AudioInput };
+
+public:
+    static const QString DEFAULT_DEVICE_NAME;
+};
+
+#endif
\ No newline at end of file
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index c09dba6190..2df766377f 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -210,7 +210,6 @@ qint64 writeStringToStream(const QString& string, QDataStream& stream) {
 
 int64_t AudioInjector::injectNextFrame() {
     if (stateHas(AudioInjectorState::NetworkInjectionFinished)) {
-        qCDebug(audio)  << "AudioInjector::injectNextFrame called but AudioInjector has finished and was not restarted. Returning.";
         return NEXT_FRAME_DELTA_ERROR_OR_FINISHED;
     }
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 7f363dd36f..75a7693de8 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -108,11 +108,21 @@ void Avatar::setShowMyLookAtVectors(bool showMine) {
     showMyLookAtVectors = showMine;
 }
 
+static bool showMyLookAtTarget = false;
+void Avatar::setShowMyLookAtTarget(bool showMine) {
+    showMyLookAtTarget = showMine;
+}
+
 static bool showOtherLookAtVectors = false;
 void Avatar::setShowOtherLookAtVectors(bool showOthers) {
     showOtherLookAtVectors = showOthers;
 }
 
+static bool showOtherLookAtTarget = false;
+void Avatar::setShowOtherLookAtTarget(bool showOthers) {
+    showOtherLookAtTarget = showOthers;
+}
+
 static bool showCollisionShapes = false;
 void Avatar::setShowCollisionShapes(bool render) {
     showCollisionShapes = render;
@@ -123,7 +133,21 @@ void Avatar::setShowNamesAboveHeads(bool show) {
     showNamesAboveHeads = show;
 }
 
+static const char* avatarTransitStatusToStringMap[] = {
+    "IDLE",
+    "STARTED",
+    "PRE_TRANSIT",
+    "START_TRANSIT",
+    "TRANSITING",
+    "END_TRANSIT",
+    "POST_TRANSIT",
+    "ENDED",
+    "ABORT_TRANSIT"
+};
+
 AvatarTransit::Status AvatarTransit::update(float deltaTime, const glm::vec3& avatarPosition, const AvatarTransit::TransitConfig& config) {
+    AvatarTransit::Status previousStatus = _status;
+
     float oneFrameDistance = _isActive ? glm::length(avatarPosition - _endPosition) : glm::length(avatarPosition - _lastPosition);
     if (oneFrameDistance > (config._minTriggerDistance * _scale)) {
         if (oneFrameDistance < (config._maxTriggerDistance * _scale)) {
@@ -140,6 +164,10 @@ AvatarTransit::Status AvatarTransit::update(float deltaTime, const glm::vec3& av
         reset();
         _status = Status::ENDED;
     }
+
+    if (previousStatus != _status) {
+        qDebug(avatars_renderer) << "AvatarTransit " << avatarTransitStatusToStringMap[(int)previousStatus] << "->" << avatarTransitStatusToStringMap[_status];
+    }
     return _status;
 }
 
@@ -711,6 +739,14 @@ void Avatar::updateRenderItem(render::Transaction& transaction) {
 
 void Avatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
+    if (isMyAvatar() ? showMyLookAtTarget : showOtherLookAtTarget) {
+        glm::vec3 lookAtTarget = getHead()->getLookAtPosition();
+        DebugDraw::getInstance().addMarker(QString("look-at-") + getID().toString(),
+                                           glm::quat(), lookAtTarget, glm::vec4(1), 1.0f);
+    } else {
+        DebugDraw::getInstance().removeMarker(QString("look-at-") + getID().toString());
+    }
+
     if (isMyAvatar() ? showMyLookAtVectors : showOtherLookAtVectors) {
         const float EYE_RAY_LENGTH = 10.0;
         const glm::vec4 BLUE(0.0f, 0.0f, _lookAtSnappingEnabled ? 1.0f : 0.25f, 1.0f);
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 7bb15ecbf7..b969449d5e 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -140,7 +140,9 @@ public:
     static void setShowAvatars(bool render);
     static void setShowReceiveStats(bool receiveStats);
     static void setShowMyLookAtVectors(bool showMine);
+    static void setShowMyLookAtTarget(bool showMine);
     static void setShowOtherLookAtVectors(bool showOthers);
+    static void setShowOtherLookAtTarget(bool showOthers);
     static void setShowCollisionShapes(bool render);
     static void setShowNamesAboveHeads(bool show);
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
index 2e8bedbb36..445184f5f8 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
@@ -17,7 +17,6 @@
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <trackers/FaceTracker.h>
-#include <trackers/EyeTracker.h>
 #include <Rig.h>
 #include "Logging.h"
 
@@ -49,7 +48,7 @@ void Head::simulate(float deltaTime) {
 
     // Update audio trailing average for rendering facial animations
     const float AUDIO_AVERAGING_SECS = 0.05f;
-    const float AUDIO_LONG_TERM_AVERAGING_SECS = 30.0f;
+    const float AUDIO_LONG_TERM_AVERAGING_SECS = 15.0f;
     _averageLoudness = glm::mix(_averageLoudness, audioLoudness, glm::min(deltaTime / AUDIO_AVERAGING_SECS, 1.0f));
 
     if (_longTermAverageLoudness == -1.0f) {
@@ -58,7 +57,7 @@ void Head::simulate(float deltaTime) {
         _longTermAverageLoudness = glm::mix(_longTermAverageLoudness, _averageLoudness, glm::min(deltaTime / AUDIO_LONG_TERM_AVERAGING_SECS, 1.0f));
     }
 
-    if (!_isEyeTrackerConnected) {
+    if (getHasProceduralEyeMovement()) {
         // Update eye saccades
         const float AVERAGE_MICROSACCADE_INTERVAL = 1.0f;
         const float AVERAGE_SACCADE_INTERVAL = 6.0f;
@@ -82,9 +81,10 @@ void Head::simulate(float deltaTime) {
     const float FULLY_OPEN = 0.0f;
     const float FULLY_CLOSED = 1.0f;
     if (getHasProceduralBlinkFaceMovement()) {
+        // handle automatic blinks
         // Detect transition from talking to not; force blink after that and a delay
         bool forceBlink = false;
-        const float TALKING_LOUDNESS = 100.0f;
+        const float TALKING_LOUDNESS = 150.0f;
         const float BLINK_AFTER_TALKING = 0.25f;
         _timeWithoutTalking += deltaTime;
         if ((_averageLoudness - _longTermAverageLoudness) > TALKING_LOUDNESS) {
@@ -129,7 +129,7 @@ void Head::simulate(float deltaTime) {
         _leftEyeBlink = FULLY_OPEN;
     }
 
-        // use data to update fake Faceshift blendshape coefficients
+    // use data to update fake Faceshift blendshape coefficients
     if (getHasAudioEnabledFaceMovement()) {
         // Update audio attack data for facial animation (eyebrows and mouth)
         float audioAttackAveragingRate = (10.0f - deltaTime * NORMAL_HZ) / 10.0f; // --> 0.9 at 60 Hz
@@ -152,7 +152,8 @@ void Head::simulate(float deltaTime) {
         _mouthTime = 0.0f;
     }
 
-    FaceTracker::updateFakeCoefficients(_leftEyeBlink,
+    FaceTracker::updateFakeCoefficients(
+        _leftEyeBlink,
         _rightEyeBlink,
         _browAudioLift,
         _audioJawOpen,
@@ -162,6 +163,8 @@ void Head::simulate(float deltaTime) {
         _transientBlendshapeCoefficients);
 
     if (getHasProceduralEyeFaceMovement()) {
+        // This controls two things, the eye brow and the upper eye lid, it is driven by the vertical up/down angle of the
+        // eyes relative to the head.  This is to try to help prevent sleepy eyes/crazy eyes.
         applyEyelidOffset(getOrientation());
     }
 
@@ -176,7 +179,7 @@ void Head::simulate(float deltaTime) {
 }
 
 void Head::calculateMouthShapes(float deltaTime) {
-    const float JAW_OPEN_SCALE = 0.015f;
+    const float JAW_OPEN_SCALE = 0.35f;
     const float JAW_OPEN_RATE = 0.9f;
     const float JAW_CLOSE_RATE = 0.90f;
     const float TIMESTEP_CONSTANT = 0.0032f;
@@ -188,11 +191,13 @@ void Head::calculateMouthShapes(float deltaTime) {
     const float FUNNEL_SPEED = 2.335f;
     const float STOP_GAIN = 5.0f;
     const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for
+    const float MAX_DELTA_LOUDNESS = 100.0f;
 
     float deltaTimeRatio = deltaTime / (1.0f / NORMAL_HZ);
 
     // From the change in loudness, decide how much to open or close the jaw
-    float audioDelta = sqrtf(glm::max(_averageLoudness - _longTermAverageLoudness, 0.0f)) * JAW_OPEN_SCALE;
+    float deltaLoudness = glm::max(glm::min(_averageLoudness - _longTermAverageLoudness, MAX_DELTA_LOUDNESS), 0.0f) / MAX_DELTA_LOUDNESS;
+    float audioDelta = powf(deltaLoudness, 2.0f) * JAW_OPEN_SCALE;
     if (audioDelta > _audioJawOpen) {
         _audioJawOpen += (audioDelta - _audioJawOpen) * JAW_OPEN_RATE * deltaTimeRatio;
     } else {
@@ -290,7 +295,7 @@ glm::quat Head::getFinalOrientationInLocalFrame() const {
 }
 
 // Everyone else's head keeps track of a lookAtPosition that everybody sees the same, and refers to where that head
-// is looking in model space -- e.g., at someone's eyeball, or between their eyes, or mouth, etc. Everyon's Interface
+// is looking in model space -- e.g., at someone's eyeball, or between their eyes, or mouth, etc. Everyone's Interface
 // will have the same value for the lookAtPosition of any given head.
 //
 // Everyone else's head also keeps track of a correctedLookAtPosition that may be different for the same head within
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 40b65c54a1..e0fed08955 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -93,19 +93,30 @@ void SkeletonModel::initJointStates() {
     emit skeletonLoaded();
 }
 
+glm::vec3 SkeletonModel::avoidCrossedEyes(const glm::vec3& lookAt) {
+    // make sure lookAt is not too close to face (avoid crosseyes)
+    glm::vec3 focusOffset = lookAt - _owningAvatar->getHead()->getEyePosition();
+    float focusDistance = glm::length(focusOffset);
+    const float MIN_LOOK_AT_FOCUS_DISTANCE = 1.0f;
+    if (focusDistance < MIN_LOOK_AT_FOCUS_DISTANCE && focusDistance > EPSILON) {
+        return _owningAvatar->getHead()->getEyePosition() + (MIN_LOOK_AT_FOCUS_DISTANCE / focusDistance) * focusOffset;
+    } else {
+        return lookAt;
+    }
+}
+
 // Called within Model::simulate call, below.
 void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     assert(!_owningAvatar->isMyAvatar());
 
     Head* head = _owningAvatar->getHead();
 
-    // make sure lookAt is not too close to face (avoid crosseyes)
-    glm::vec3 lookAt = head->getCorrectedLookAtPosition();
-    glm::vec3 focusOffset = lookAt - _owningAvatar->getHead()->getEyePosition();
-    float focusDistance = glm::length(focusOffset);
-    const float MIN_LOOK_AT_FOCUS_DISTANCE = 1.0f;
-    if (focusDistance < MIN_LOOK_AT_FOCUS_DISTANCE && focusDistance > EPSILON) {
-        lookAt = _owningAvatar->getHead()->getEyePosition() + (MIN_LOOK_AT_FOCUS_DISTANCE / focusDistance) * focusOffset;
+    bool eyePosesValid = !head->getHasProceduralEyeMovement();
+    glm::vec3 lookAt;
+    if (eyePosesValid) {
+        lookAt = head->getLookAtPosition(); // don't apply no-crosseyes code etc when eyes are being tracked
+    } else {
+        lookAt = avoidCrossedEyes(head->getCorrectedLookAtPosition());
     }
 
     // no need to call Model::updateRig() because otherAvatars get their joint state
@@ -288,6 +299,15 @@ bool SkeletonModel::getEyeModelPositions(glm::vec3& firstEyePosition, glm::vec3&
     return false;
 }
 
+
+bool SkeletonModel::getIsJointOverridden(int jointIndex) const {
+    // has this joint been set by a script?
+    if (!isLoaded() || _rig.jointStatesEmpty()) {
+        return false;
+    }
+    return _rig.getIsJointOverridden(jointIndex);
+}
+
 bool SkeletonModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
     if (getEyeModelPositions(firstEyePosition, secondEyePosition)) {
         firstEyePosition = _translation + _rotation * firstEyePosition;
@@ -352,4 +372,3 @@ bool SkeletonModel::hasSkeleton() {
 
 void SkeletonModel::onInvalidate() {
 }
-
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
index 99f6632306..6b0bd79f0b 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
@@ -37,9 +37,12 @@ public:
     void initJointStates() override;
 
     void simulate(float deltaTime, bool fullUpdate = true) override;
+    glm::vec3 avoidCrossedEyes(const glm::vec3& lookAt);
     void updateRig(float deltaTime, glm::mat4 parentTransform) override;
     void updateAttitude(const glm::quat& orientation);
 
+    bool getIsJointOverridden(int jointIndex) const;
+
     /// Returns the index of the left hand joint, or -1 if not found.
     int getLeftHandJointIndex() const { return isActive() ? _rig.indexOfJoint("LeftHand") : -1; }
 
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index c03f9430be..a91154ff15 100755
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -245,9 +245,10 @@ QByteArray AvatarData::toByteArrayStateful(AvatarDataDetail dataDetail, bool dro
 }
 
 QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSentTime,
-                                   const QVector<JointData>& lastSentJointData,
-    AvatarDataPacket::SendStatus& sendStatus, bool dropFaceTracking, bool distanceAdjust,
-    glm::vec3 viewerPosition, QVector<JointData>* sentJointDataOut, int maxDataSize, AvatarDataRate* outboundDataRateOut) const {
+                                   const QVector<JointData>& lastSentJointData, AvatarDataPacket::SendStatus& sendStatus,
+                                   bool dropFaceTracking, bool distanceAdjust, glm::vec3 viewerPosition,
+                                   QVector<JointData>* sentJointDataOut,
+                                   int maxDataSize, AvatarDataRate* outboundDataRateOut) const {
 
     bool cullSmallChanges = (dataDetail == CullSmallData);
     bool sendAll = (dataDetail == SendAllData);
@@ -532,7 +533,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
             setAtBit16(flags, IS_FACE_TRACKER_CONNECTED);
         }
         // eye tracker state
-        if (_headData->_isEyeTrackerConnected) {
+        if (!_headData->_hasProceduralEyeMovement) {
             setAtBit16(flags, IS_EYE_TRACKER_CONNECTED);
         }
         // referential state
@@ -1150,7 +1151,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
             + (oneAtBit16(bitItems, HAND_STATE_FINGER_POINTING_BIT) ? IS_FINGER_POINTING_FLAG : 0);
 
         auto newFaceTrackerConnected = oneAtBit16(bitItems, IS_FACE_TRACKER_CONNECTED);
-        auto newEyeTrackerConnected = oneAtBit16(bitItems, IS_EYE_TRACKER_CONNECTED);
+        auto newHasntProceduralEyeMovement = oneAtBit16(bitItems, IS_EYE_TRACKER_CONNECTED);
 
         auto newHasAudioEnabledFaceMovement = oneAtBit16(bitItems, AUDIO_ENABLED_FACE_MOVEMENT);
         auto newHasProceduralEyeFaceMovement = oneAtBit16(bitItems, PROCEDURAL_EYE_FACE_MOVEMENT);
@@ -1161,7 +1162,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         bool keyStateChanged = (_keyState != newKeyState);
         bool handStateChanged = (_handState != newHandState);
         bool faceStateChanged = (_headData->_isFaceTrackerConnected != newFaceTrackerConnected);
-        bool eyeStateChanged = (_headData->_isEyeTrackerConnected != newEyeTrackerConnected);
+        bool eyeStateChanged = (_headData->_hasProceduralEyeMovement == newHasntProceduralEyeMovement);
         bool audioEnableFaceMovementChanged = (_headData->getHasAudioEnabledFaceMovement() != newHasAudioEnabledFaceMovement);
         bool proceduralEyeFaceMovementChanged = (_headData->getHasProceduralEyeFaceMovement() != newHasProceduralEyeFaceMovement);
         bool proceduralBlinkFaceMovementChanged = (_headData->getHasProceduralBlinkFaceMovement() != newHasProceduralBlinkFaceMovement);
@@ -1174,7 +1175,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         _keyState = newKeyState;
         _handState = newHandState;
         _headData->_isFaceTrackerConnected = newFaceTrackerConnected;
-        _headData->_isEyeTrackerConnected = newEyeTrackerConnected;
+        _headData->setHasProceduralEyeMovement(!newHasntProceduralEyeMovement);
         _headData->setHasAudioEnabledFaceMovement(newHasAudioEnabledFaceMovement);
         _headData->setHasProceduralEyeFaceMovement(newHasProceduralEyeFaceMovement);
         _headData->setHasProceduralBlinkFaceMovement(newHasProceduralBlinkFaceMovement);
diff --git a/libraries/avatars/src/ClientTraitsHandler.cpp b/libraries/avatars/src/ClientTraitsHandler.cpp
index e133f178df..51f843b83c 100644
--- a/libraries/avatars/src/ClientTraitsHandler.cpp
+++ b/libraries/avatars/src/ClientTraitsHandler.cpp
@@ -171,6 +171,8 @@ void ClientTraitsHandler::processTraitOverride(QSharedPointer<ReceivedMessage> m
                 return;
             }
 
+            // AJT: DON'T CHECK THIS IN, disable model URL overrides.
+            /*
             // only accept an override if this is for a trait type we override
             // and the version matches what we last sent for skeleton
             if (traitType == AvatarTraits::SkeletonModelURL
@@ -192,6 +194,7 @@ void ClientTraitsHandler::processTraitOverride(QSharedPointer<ReceivedMessage> m
             } else {
                 message->seek(message->getPosition() + traitBinarySize);
             }
+            */
         }
     }
 }
diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp
index 19f5efcd16..c86e534929 100644
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@@ -196,3 +196,40 @@ void HeadData::fromJson(const QJsonObject& json) {
         setHeadOrientation(quatFromJsonValue(json[JSON_AVATAR_HEAD_ROTATION]));
     }
 }
+
+bool HeadData::getHasProceduralEyeFaceMovement() const {
+    return _hasProceduralEyeFaceMovement;
+}
+
+void HeadData::setHasProceduralEyeFaceMovement(bool hasProceduralEyeFaceMovement) {
+    _hasProceduralEyeFaceMovement = hasProceduralEyeFaceMovement;
+}
+
+bool HeadData::getHasProceduralBlinkFaceMovement() const {
+    // return _hasProceduralBlinkFaceMovement;
+    return _hasProceduralBlinkFaceMovement && !_isFaceTrackerConnected;
+}
+
+void HeadData::setHasProceduralBlinkFaceMovement(bool hasProceduralBlinkFaceMovement) {
+    _hasProceduralBlinkFaceMovement = hasProceduralBlinkFaceMovement;
+}
+
+bool HeadData::getHasAudioEnabledFaceMovement() const {
+    return _hasAudioEnabledFaceMovement;
+}
+
+void HeadData::setHasAudioEnabledFaceMovement(bool hasAudioEnabledFaceMovement) {
+    _hasAudioEnabledFaceMovement = hasAudioEnabledFaceMovement;
+}
+
+bool HeadData::getHasProceduralEyeMovement() const {
+    return _hasProceduralEyeMovement;
+}
+
+void HeadData::setHasProceduralEyeMovement(bool hasProceduralEyeMovement) {
+    _hasProceduralEyeMovement = hasProceduralEyeMovement;
+}
+
+void HeadData::setFaceTrackerConnected(bool value) {
+    _isFaceTrackerConnected = value;
+}
diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h
index 6d211da2cd..dc5aaf2595 100644
--- a/libraries/avatars/src/HeadData.h
+++ b/libraries/avatars/src/HeadData.h
@@ -72,23 +72,17 @@ public:
     }
     bool lookAtPositionChangedSince(quint64 time) { return _lookAtPositionChanged >= time; }
 
-    bool getHasProceduralEyeFaceMovement() const { return _hasProceduralEyeFaceMovement; }
+    bool getHasProceduralEyeFaceMovement() const;
+    void setHasProceduralEyeFaceMovement(bool hasProceduralEyeFaceMovement);
+    bool getHasProceduralBlinkFaceMovement() const;
+    void setHasProceduralBlinkFaceMovement(bool hasProceduralBlinkFaceMovement);
+    bool getHasAudioEnabledFaceMovement() const;
+    void setHasAudioEnabledFaceMovement(bool hasAudioEnabledFaceMovement);
+    bool getHasProceduralEyeMovement() const;
+    void setHasProceduralEyeMovement(bool hasProceduralEyeMovement);
 
-    void setHasProceduralEyeFaceMovement(const bool hasProceduralEyeFaceMovement) {
-        _hasProceduralEyeFaceMovement = hasProceduralEyeFaceMovement;
-    }
-
-    bool getHasProceduralBlinkFaceMovement() const { return _hasProceduralBlinkFaceMovement; }
-
-    void setHasProceduralBlinkFaceMovement(const bool hasProceduralBlinkFaceMovement) {
-        _hasProceduralBlinkFaceMovement = hasProceduralBlinkFaceMovement;
-    }
-
-    bool getHasAudioEnabledFaceMovement() const { return _hasAudioEnabledFaceMovement; }
-
-    void setHasAudioEnabledFaceMovement(const bool hasAudioEnabledFaceMovement) {
-        _hasAudioEnabledFaceMovement = hasAudioEnabledFaceMovement;
-    }
+    void setFaceTrackerConnected(bool value);
+    bool getFaceTrackerConnected() const { return _isFaceTrackerConnected; }
 
     friend class AvatarData;
 
@@ -107,8 +101,10 @@ protected:
     bool _hasAudioEnabledFaceMovement { true };
     bool _hasProceduralBlinkFaceMovement { true };
     bool _hasProceduralEyeFaceMovement { true };
+    bool _hasProceduralEyeMovement { true };
+
     bool _isFaceTrackerConnected { false };
-    bool _isEyeTrackerConnected { false };
+
     float _leftEyeBlink { 0.0f };
     float _rightEyeBlink { 0.0f };
     float _averageLoudness { 0.0f };
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 9de32158c5..70290fe283 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -45,6 +45,7 @@
 #include <QJsonArray>
 
 ModelBaker::ModelBaker(const QUrl& inputModelURL, const QString& bakedOutputDirectory, const QString& originalOutputDirectory, bool hasBeenBaked) :
+    _originalInputModelURL(inputModelURL),
     _modelURL(inputModelURL),
     _bakedOutputDir(bakedOutputDirectory),
     _originalOutputDir(originalOutputDirectory),
@@ -245,6 +246,12 @@ void ModelBaker::bakeSourceCopy() {
         // Begin hfm baking
         baker.run();
 
+        const auto& errors = baker.getDracoErrors();
+        if (std::find(errors.cbegin(), errors.cend(), true) != errors.cend()) {
+            handleError("Failed to finalize the baking of a draco Geometry node from model " + _modelURL.toString());
+            return;
+        }
+
         _hfmModel = baker.getHFMModel();
         _materialMapping = baker.getMaterialMapping();
         dracoMeshes = baker.getDracoMeshes();
@@ -436,8 +443,7 @@ void ModelBaker::abort() {
 
 bool ModelBaker::buildDracoMeshNode(FBXNode& dracoMeshNode, const QByteArray& dracoMeshBytes, const std::vector<hifi::ByteArray>& dracoMaterialList) {
     if (dracoMeshBytes.isEmpty()) {
-        handleError("Failed to finalize the baking of a draco Geometry node");
-        return false;
+        handleWarning("Empty mesh detected in model: '" + _modelURL.toString() + "'. It will be included in the baked output.");
     }
 
     FBXNode dracoNode;
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index b98d9716e1..991cbc25bf 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -51,6 +51,7 @@ public:
     virtual void setWasAborted(bool wasAborted) override;
 
     QUrl getModelURL() const { return _modelURL; }
+    QUrl getOriginalInputModelURL() const { return _originalInputModelURL; }
     virtual QUrl getFullOutputMappingURL() const;
     QUrl getBakedModelURL() const { return _bakedModelURL; }
 
@@ -67,6 +68,7 @@ protected:
     void exportScene();
 
     FBXNode _rootNode;
+    QUrl _originalInputModelURL;
     QUrl _modelURL;
     QUrl _outputURLSuffix;
     QUrl _mappingURL;
diff --git a/libraries/baking/src/OBJBaker.h b/libraries/baking/src/OBJBaker.h
index 9d0fe53e3c..55adec5786 100644
--- a/libraries/baking/src/OBJBaker.h
+++ b/libraries/baking/src/OBJBaker.h
@@ -28,7 +28,7 @@ protected:
 
 private:
     void createFBXNodeTree(FBXNode& rootNode, const hfm::Model::Pointer& hfmModel, const hifi::ByteArray& dracoMesh);
-    void setMaterialNodeProperties(FBXNode& materialNode, QString material,  const hfm::Model::Pointer& hfmModel);
+    void setMaterialNodeProperties(FBXNode& materialNode, QString material, const hfm::Model::Pointer& hfmModel);
     NodeID nextNodeID() { return _nodeID++; }
 
     NodeID _nodeID { 0 };
diff --git a/libraries/baking/src/TextureBaker.cpp b/libraries/baking/src/TextureBaker.cpp
index e4b0abcef6..182caf7fc6 100644
--- a/libraries/baking/src/TextureBaker.cpp
+++ b/libraries/baking/src/TextureBaker.cpp
@@ -250,6 +250,7 @@ void TextureBaker::processTexture() {
         QFile file { _metaTextureFileName };
         if (!file.open(QIODevice::WriteOnly) || file.write(data) == -1) {
             handleError("Could not write meta texture for " + _textureURL.toString());
+            return;
         } else {
             _outputFiles.push_back(_metaTextureFileName);
         }
diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp
index 9f9d92fed7..40011f2682 100644
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@@ -347,6 +347,10 @@ namespace controller {
             makePosePair(Action::HIPS, "Hips"),
             makePosePair(Action::SPINE2, "Spine2"),
             makePosePair(Action::HEAD, "Head"),
+            makePosePair(Action::LEFT_EYE, "LeftEye"),
+            makePosePair(Action::RIGHT_EYE, "RightEye"),
+            makeAxisPair(Action::LEFT_EYE_BLINK, "LeftEyeBlink"),
+            makeAxisPair(Action::RIGHT_EYE_BLINK, "RightEyeBlink"),
 
             makePosePair(Action::LEFT_HAND_THUMB1, "LeftHandThumb1"),
             makePosePair(Action::LEFT_HAND_THUMB2, "LeftHandThumb2"),
diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h
index 3e99d8d147..f91d9f2522 100644
--- a/libraries/controllers/src/controllers/Actions.h
+++ b/libraries/controllers/src/controllers/Actions.h
@@ -181,6 +181,11 @@ enum class Action {
     TRACKED_OBJECT_15,
     SPRINT,
 
+    LEFT_EYE,
+    RIGHT_EYE,
+    LEFT_EYE_BLINK,
+    RIGHT_EYE_BLINK,
+
     NUM_ACTIONS
 };
 
diff --git a/libraries/controllers/src/controllers/AxisValue.cpp b/libraries/controllers/src/controllers/AxisValue.cpp
index 4b7913754c..0acbc6dbc7 100644
--- a/libraries/controllers/src/controllers/AxisValue.cpp
+++ b/libraries/controllers/src/controllers/AxisValue.cpp
@@ -12,10 +12,13 @@
 
 namespace controller {
 
-    AxisValue::AxisValue(const float value, const quint64 timestamp) :
-        value(value), timestamp(timestamp) { }
+    AxisValue::AxisValue(const float value, const quint64 timestamp, bool valid) :
+        value(value), timestamp(timestamp), valid(valid) {
+    }
 
     bool AxisValue::operator==(const AxisValue& right) const {
-        return value == right.value && timestamp == right.timestamp;
+        return value == right.value &&
+            timestamp == right.timestamp &&
+            valid == right.valid;
     }
 }
diff --git a/libraries/controllers/src/controllers/AxisValue.h b/libraries/controllers/src/controllers/AxisValue.h
index e4bc20f7d2..ec356e1fb3 100644
--- a/libraries/controllers/src/controllers/AxisValue.h
+++ b/libraries/controllers/src/controllers/AxisValue.h
@@ -21,14 +21,14 @@ namespace controller {
         float value { 0.0f };
         // The value can be timestamped to determine if consecutive identical values should be output (e.g., mouse movement).
         quint64 timestamp { 0 };
+        bool valid { false };
 
         AxisValue() {}
-        AxisValue(const float value, const quint64 timestamp);
+        AxisValue(const float value, const quint64 timestamp, bool valid = true);
 
         bool operator ==(const AxisValue& right) const;
         bool operator !=(const AxisValue& right) const { return !(*this == right); }
     };
-
 }
 
 #endif // hifi_controllers_AxisValue_h
diff --git a/libraries/controllers/src/controllers/InputDevice.cpp b/libraries/controllers/src/controllers/InputDevice.cpp
index dd430263fa..b28e7cfc82 100644
--- a/libraries/controllers/src/controllers/InputDevice.cpp
+++ b/libraries/controllers/src/controllers/InputDevice.cpp
@@ -77,13 +77,13 @@ namespace controller {
                 return { getButton(channel), 0 };
 
             case ChannelType::POSE:
-                return { getPose(channel).valid ? 1.0f : 0.0f, 0 };
+                return { getPose(channel).valid ? 1.0f : 0.0f, 0, getPose(channel).valid };
 
             default:
                 break;
         }
 
-        return { 0.0f, 0 };
+        return { 0.0f, 0, false };
     }
 
     AxisValue InputDevice::getValue(const Input& input) const {
diff --git a/libraries/controllers/src/controllers/StandardController.cpp b/libraries/controllers/src/controllers/StandardController.cpp
index ece10ecca3..dbc92cc7e5 100644
--- a/libraries/controllers/src/controllers/StandardController.cpp
+++ b/libraries/controllers/src/controllers/StandardController.cpp
@@ -354,6 +354,10 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(HIPS, "Hips"),
         makePair(SPINE2, "Spine2"),
         makePair(HEAD, "Head"),
+        makePair(LEFT_EYE, "LeftEye"),
+        makePair(RIGHT_EYE, "RightEye"),
+        makePair(LEFT_EYE_BLINK, "LeftEyeBlink"),
+        makePair(RIGHT_EYE_BLINK, "RightEyeBlink"),
 
         // Aliases, PlayStation style names
         makePair(LB, "L1"),
diff --git a/libraries/controllers/src/controllers/StandardControls.h b/libraries/controllers/src/controllers/StandardControls.h
index f521ab81cf..99d9246264 100644
--- a/libraries/controllers/src/controllers/StandardControls.h
+++ b/libraries/controllers/src/controllers/StandardControls.h
@@ -90,6 +90,8 @@ namespace controller {
         // Grips
         LEFT_GRIP,
         RIGHT_GRIP,
+        LEFT_EYE_BLINK,
+        RIGHT_EYE_BLINK,
         NUM_STANDARD_AXES,
         LZ = LT,
         RZ = RT
@@ -174,6 +176,8 @@ namespace controller {
         TRACKED_OBJECT_13,
         TRACKED_OBJECT_14,
         TRACKED_OBJECT_15,
+        LEFT_EYE,
+        RIGHT_EYE,
         NUM_STANDARD_POSES
     };
 
diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index 33dc37312e..1eb1a9fa1a 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -256,6 +256,9 @@ void UserInputMapper::update(float deltaTime) {
     for (auto& channel : _actionStates) {
         channel = 0.0f;
     }
+    for (unsigned int i = 0; i < _actionStatesValid.size(); i++) {
+        _actionStatesValid[i] = true;
+    }
 
     for (auto& channel : _poseStates) {
         channel = Pose();
@@ -1233,5 +1236,17 @@ void UserInputMapper::disableMapping(const Mapping::Pointer& mapping) {
     }
 }
 
+void UserInputMapper::setActionState(Action action, float value, bool valid) {
+    _actionStates[toInt(action)] = value;
+    _actionStatesValid[toInt(action)] = valid;
+}
+
+void UserInputMapper::deltaActionState(Action action, float delta, bool valid) {
+    _actionStates[toInt(action)] += delta;
+    bool wasValid = _actionStatesValid[toInt(action)];
+    _actionStatesValid[toInt(action)] = wasValid & valid;
+}
+
+
 }
 
diff --git a/libraries/controllers/src/controllers/UserInputMapper.h b/libraries/controllers/src/controllers/UserInputMapper.h
index 2b3c947491..cd44f3226c 100644
--- a/libraries/controllers/src/controllers/UserInputMapper.h
+++ b/libraries/controllers/src/controllers/UserInputMapper.h
@@ -82,13 +82,14 @@ namespace controller {
         QString getActionName(Action action) const;
         QString getStandardPoseName(uint16_t pose);
         float getActionState(Action action) const { return _actionStates[toInt(action)]; }
+        bool getActionStateValid(Action action) const { return _actionStatesValid[toInt(action)]; }
         Pose getPoseState(Action action) const;
         int findAction(const QString& actionName) const;
         QVector<QString> getActionNames() const;
         Input inputFromAction(Action action) const { return getActionInputs()[toInt(action)].first; }
 
-        void setActionState(Action action, float value) { _actionStates[toInt(action)] = value; }
-        void deltaActionState(Action action, float delta) { _actionStates[toInt(action)] += delta; }
+        void setActionState(Action action, float value, bool valid = true);
+        void deltaActionState(Action action, float delta, bool valid = true);
         void setActionState(Action action, const Pose& value) { _poseStates[toInt(action)] = value; }
         bool triggerHapticPulse(float strength, float duration, controller::Hand hand);
         bool triggerHapticPulseOnDevice(uint16 deviceID, float strength, float duration, controller::Hand hand);
@@ -146,6 +147,7 @@ namespace controller {
         std::vector<float> _actionStates = std::vector<float>(toInt(Action::NUM_ACTIONS), 0.0f);
         std::vector<float> _actionScales = std::vector<float>(toInt(Action::NUM_ACTIONS), 1.0f);
         std::vector<float> _lastActionStates = std::vector<float>(toInt(Action::NUM_ACTIONS), 0.0f);
+        std::vector<bool> _actionStatesValid = std::vector<bool>(toInt(Action::NUM_ACTIONS), false);
         std::vector<Pose> _poseStates = std::vector<Pose>(toInt(Action::NUM_ACTIONS));
         std::vector<AxisValue> _lastStandardStates = std::vector<AxisValue>();
 
@@ -167,7 +169,7 @@ namespace controller {
         ConditionalPointer conditionalFor(const QJSValue& endpoint);
         ConditionalPointer conditionalFor(const QScriptValue& endpoint);
         ConditionalPointer conditionalFor(const Input& endpoint) const;
-        
+
         MappingPointer parseMapping(const QJsonValue& json);
         RoutePointer parseRoute(const QJsonValue& value);
         EndpointPointer parseDestination(const QJsonValue& value);
diff --git a/libraries/controllers/src/controllers/impl/Endpoint.h b/libraries/controllers/src/controllers/impl/Endpoint.h
index bcf71f3094..692e427e16 100644
--- a/libraries/controllers/src/controllers/impl/Endpoint.h
+++ b/libraries/controllers/src/controllers/impl/Endpoint.h
@@ -100,7 +100,7 @@ namespace controller {
             _currentPose = value;
         }
     protected:
-        AxisValue _currentValue { 0.0f, 0 };
+        AxisValue _currentValue { 0.0f, 0, false };
         Pose _currentPose {};
     };
 
diff --git a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
index 58744c468c..4be23b0c29 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
+++ b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
@@ -26,7 +26,7 @@ void ActionEndpoint::apply(AxisValue newValue, const Pointer& source) {
     _currentValue.value += newValue.value;
 
     if (_input != Input::INVALID_INPUT) {
-        userInputMapper->deltaActionState(Action(_input.getChannel()), newValue.value);
+        userInputMapper->deltaActionState(Action(_input.getChannel()), newValue.value, newValue.valid);
     }
 }
 
diff --git a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h
index 94da4663aa..7ab21031a7 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h
+++ b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h
@@ -32,7 +32,7 @@ public:
     virtual void reset() override;
 
 private:
-    AxisValue _currentValue { 0.0f, 0 };
+    AxisValue _currentValue { 0.0f, 0, false };
     Pose _currentPose{};
 };
 
diff --git a/libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.cpp b/libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.cpp
index f54c786a33..82a44bd7ae 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.cpp
+++ b/libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.cpp
@@ -27,7 +27,9 @@ bool CompositeEndpoint::readable() const {
 AxisValue CompositeEndpoint::peek() const {
     auto negative = first->peek();
     auto positive = second->peek();
-    auto result = AxisValue(positive.value - negative.value, std::max(positive.timestamp, negative.timestamp));
+    auto result = AxisValue(positive.value - negative.value,
+                            std::max(positive.timestamp, negative.timestamp),
+                            negative.valid && positive.valid);
     return result;
 }
 
@@ -35,7 +37,9 @@ AxisValue CompositeEndpoint::peek() const {
 AxisValue CompositeEndpoint::value() {
     auto negative = first->value();
     auto positive = second->value();
-    auto result = AxisValue(positive.value - negative.value, std::max(positive.timestamp, negative.timestamp));
+    auto result = AxisValue(positive.value - negative.value,
+                            std::max(positive.timestamp, negative.timestamp),
+                            negative.valid && positive.valid);
     return result;
 }
 
diff --git a/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.cpp b/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.cpp
index 3755d860b6..db0aed47e1 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.cpp
+++ b/libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.cpp
@@ -16,7 +16,7 @@ using namespace controller;
 
 AxisValue InputEndpoint::peek() const {
     if (isPose()) {
-        return peekPose().valid ? AxisValue(1.0f, 0) : AxisValue(0.0f, 0);
+        return peekPose().valid ? AxisValue(1.0f, 0) : AxisValue(0.0f, 0, false);
     }
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
     auto deviceProxy = userInputMapper->getDevice(_input);
diff --git a/libraries/controllers/src/controllers/impl/endpoints/ScriptEndpoint.h b/libraries/controllers/src/controllers/impl/endpoints/ScriptEndpoint.h
index e739ab0b01..1aa1746b24 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/ScriptEndpoint.h
+++ b/libraries/controllers/src/controllers/impl/endpoints/ScriptEndpoint.h
@@ -41,7 +41,7 @@ protected:
 private:
     QScriptValue _callable;
     float _lastValueRead { 0.0f };
-    AxisValue _lastValueWritten { 0.0f, 0 };
+    AxisValue _lastValueWritten { 0.0f, 0, false };
 
     bool _returnPose { false };
     Pose _lastPoseRead;
diff --git a/libraries/controllers/src/controllers/impl/filters/ClampFilter.h b/libraries/controllers/src/controllers/impl/filters/ClampFilter.h
index 04684655c9..7ec8173c2a 100644
--- a/libraries/controllers/src/controllers/impl/filters/ClampFilter.h
+++ b/libraries/controllers/src/controllers/impl/filters/ClampFilter.h
@@ -19,7 +19,7 @@ class ClampFilter : public Filter {
 public:
     ClampFilter(float min = 0.0, float max = 1.0) : _min(min), _max(max) {};
     virtual AxisValue apply(AxisValue value) const override {
-        return { glm::clamp(value.value, _min, _max), value.timestamp };
+        return { glm::clamp(value.value, _min, _max), value.timestamp, value.valid };
     }
 
     virtual Pose apply(Pose value) const override { return value; }
diff --git a/libraries/controllers/src/controllers/impl/filters/ConstrainToIntegerFilter.h b/libraries/controllers/src/controllers/impl/filters/ConstrainToIntegerFilter.h
index 2cce5f828d..3adcbbd008 100644
--- a/libraries/controllers/src/controllers/impl/filters/ConstrainToIntegerFilter.h
+++ b/libraries/controllers/src/controllers/impl/filters/ConstrainToIntegerFilter.h
@@ -20,7 +20,7 @@ public:
     ConstrainToIntegerFilter() = default;
 
     virtual AxisValue apply(AxisValue value) const override {
-        return { glm::sign(value.value), value.timestamp };
+        return { glm::sign(value.value), value.timestamp, value.valid };
     }
 
     virtual Pose apply(Pose value) const override { return value; }
diff --git a/libraries/controllers/src/controllers/impl/filters/ConstrainToPositiveIntegerFilter.h b/libraries/controllers/src/controllers/impl/filters/ConstrainToPositiveIntegerFilter.h
index 07dd6654f1..5dcc43b3f7 100644
--- a/libraries/controllers/src/controllers/impl/filters/ConstrainToPositiveIntegerFilter.h
+++ b/libraries/controllers/src/controllers/impl/filters/ConstrainToPositiveIntegerFilter.h
@@ -20,7 +20,7 @@ public:
     ConstrainToPositiveIntegerFilter() = default;
 
     virtual AxisValue apply(AxisValue value) const override {
-        return { (value.value <= 0.0f) ? 0.0f : 1.0f, value.timestamp };
+        return { (value.value <= 0.0f) ? 0.0f : 1.0f, value.timestamp, value.valid };
     }
 
     virtual Pose apply(Pose value) const override { return value; }
diff --git a/libraries/controllers/src/controllers/impl/filters/DeadZoneFilter.cpp b/libraries/controllers/src/controllers/impl/filters/DeadZoneFilter.cpp
index 84d3b9de60..4c396fee70 100644
--- a/libraries/controllers/src/controllers/impl/filters/DeadZoneFilter.cpp
+++ b/libraries/controllers/src/controllers/impl/filters/DeadZoneFilter.cpp
@@ -18,7 +18,7 @@ AxisValue DeadZoneFilter::apply(AxisValue value) const {
     if (magnitude < _min) {
         return { 0.0f, value.timestamp };
     }
-    return { (magnitude - _min) * scale, value.timestamp };
+    return { (magnitude - _min) * scale, value.timestamp, value.valid };
 }
 
 bool DeadZoneFilter::parseParameters(const QJsonValue& parameters) {
diff --git a/libraries/controllers/src/controllers/impl/filters/HysteresisFilter.cpp b/libraries/controllers/src/controllers/impl/filters/HysteresisFilter.cpp
index 91e59a39b9..b7b573a98c 100644
--- a/libraries/controllers/src/controllers/impl/filters/HysteresisFilter.cpp
+++ b/libraries/controllers/src/controllers/impl/filters/HysteresisFilter.cpp
@@ -19,7 +19,6 @@ HysteresisFilter::HysteresisFilter(float min, float max) : _min(min), _max(max)
     }
 };
 
-
 AxisValue HysteresisFilter::apply(AxisValue value) const {
     if (_signaled) {
         if (value.value <= _min) {
@@ -30,7 +29,7 @@ AxisValue HysteresisFilter::apply(AxisValue value) const {
             _signaled = true;
         }
     }
-    return { _signaled ? 1.0f : 0.0f, value.timestamp };
+    return { _signaled ? 1.0f : 0.0f, value.timestamp, value.valid };
 }
 
 bool HysteresisFilter::parseParameters(const QJsonValue& parameters) {
diff --git a/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp b/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp
index c0396857e5..dd181b7857 100644
--- a/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp
+++ b/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp
@@ -6,5 +6,5 @@ NotFilter::NotFilter() {
 }
 
 AxisValue NotFilter::apply(AxisValue value) const {
-    return { (value.value == 0.0f) ? 1.0f : 0.0f, value.timestamp };
+    return { (value.value == 0.0f) ? 1.0f : 0.0f, value.timestamp, value.valid };
 }
diff --git a/libraries/controllers/src/controllers/impl/filters/PulseFilter.cpp b/libraries/controllers/src/controllers/impl/filters/PulseFilter.cpp
index d37eb99ca9..353bf7dca9 100644
--- a/libraries/controllers/src/controllers/impl/filters/PulseFilter.cpp
+++ b/libraries/controllers/src/controllers/impl/filters/PulseFilter.cpp
@@ -29,7 +29,7 @@ AxisValue PulseFilter::apply(AxisValue value) const {
         _lastEmitTime = DEFAULT_LAST_EMIT_TIME;
     }
 
-    return { result, value.timestamp };
+    return { result, value.timestamp, value.valid };
 }
 
 bool PulseFilter::parseParameters(const QJsonValue& parameters) {
diff --git a/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h b/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h
index 3eb58e7f47..7c146d4e4a 100644
--- a/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h
+++ b/libraries/controllers/src/controllers/impl/filters/ScaleFilter.h
@@ -23,7 +23,7 @@ public:
     ScaleFilter(float scale) : _scale(scale) {}
 
     virtual AxisValue apply(AxisValue value) const override {
-        return { value.value * _scale, value.timestamp };
+        return { value.value * _scale, value.timestamp, value.valid };
     }
 
     virtual Pose apply(Pose value) const override {
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 1d0fc5a128..74d36101db 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -585,26 +585,13 @@ void OpenGLDisplayPlugin::updateFrameData() {
 
 std::function<void(gpu::Batch&, const gpu::TexturePointer&)> OpenGLDisplayPlugin::getHUDOperator() {
     auto hudPipeline = _hudPipeline;
-    auto hudStereo = isStereo();
-    auto hudCompositeFramebufferSize = _compositeFramebuffer->getSize();
-    std::array<glm::ivec4, 2> hudEyeViewports;
-    for_each_eye([&](Eye eye) {
-        hudEyeViewports[eye] = eyeViewport(eye);
-    });
+    auto hudCompositeFramebufferSize = getRecommendedRenderSize();
     return [=](gpu::Batch& batch, const gpu::TexturePointer& hudTexture) {
         if (hudPipeline && hudTexture) {
-            batch.enableStereo(false);
             batch.setPipeline(hudPipeline);
             batch.setResourceTexture(0, hudTexture);
-            if (hudStereo) {
-                for_each_eye([&](Eye eye) {
-                    batch.setViewportTransform(hudEyeViewports[eye]);
-                    batch.draw(gpu::TRIANGLE_STRIP, 4);
-                });
-            } else {
-                batch.setViewportTransform(ivec4(uvec2(0), hudCompositeFramebufferSize));
-                batch.draw(gpu::TRIANGLE_STRIP, 4);
-            }
+            batch.setViewportTransform(ivec4(uvec2(0), hudCompositeFramebufferSize));
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
         }
     };
 }
@@ -614,22 +601,14 @@ void OpenGLDisplayPlugin::compositePointer() {
     const auto& cursorData = _cursorsData[cursorManager.getCursor()->getIcon()];
     auto cursorTransform = DependencyManager::get<CompositorHelper>()->getReticleTransform(glm::mat4());
     render([&](gpu::Batch& batch) {
-        batch.enableStereo(false);
         batch.setProjectionTransform(mat4());
         batch.setFramebuffer(_compositeFramebuffer);
         batch.setPipeline(_cursorPipeline);
         batch.setResourceTexture(0, cursorData.texture);
         batch.resetViewTransform();
         batch.setModelTransform(cursorTransform);
-        if (isStereo()) {
-            for_each_eye([&](Eye eye) {
-                batch.setViewportTransform(eyeViewport(eye));
-                batch.draw(gpu::TRIANGLE_STRIP, 4);
-            });
-        } else {
-            batch.setViewportTransform(ivec4(uvec2(0), _compositeFramebuffer->getSize()));
-            batch.draw(gpu::TRIANGLE_STRIP, 4);
-        }
+        batch.setViewportTransform(ivec4(uvec2(0), _compositeFramebuffer->getSize()));
+        batch.draw(gpu::TRIANGLE_STRIP, 4);
     });
 }
 
@@ -871,16 +850,6 @@ bool OpenGLDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     return Parent::beginFrameRender(frameIndex);
 }
 
-ivec4 OpenGLDisplayPlugin::eyeViewport(Eye eye) const {
-    uvec2 vpSize = _compositeFramebuffer->getSize();
-    vpSize.x /= 2;
-    uvec2 vpPos;
-    if (eye == Eye::Right) {
-        vpPos.x = vpSize.x;
-    }
-    return ivec4(vpPos, vpSize);
-}
-
 gpu::gl::GLBackend* OpenGLDisplayPlugin::getGLBackend() {
     if (!_gpuContext || !_gpuContext->getBackend()) {
         return nullptr;
@@ -906,7 +875,7 @@ OpenGLDisplayPlugin::~OpenGLDisplayPlugin() {
 }
 
 void OpenGLDisplayPlugin::updateCompositeFramebuffer() {
-    auto renderSize = glm::uvec2(getRecommendedRenderSize());
+    auto renderSize = getRecommendedRenderSize();
     if (!_compositeFramebuffer || _compositeFramebuffer->getSize() != renderSize) {
         _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_SRGBA_32, renderSize.x, renderSize.y));
     }
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index a8d7847c09..15cebf7e3a 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -137,7 +137,6 @@ protected:
 
     void present(const std::shared_ptr<RefreshRateController>& refreshRateController);
     virtual void swapBuffers();
-    ivec4 eyeViewport(Eye eye) const;
 
     void render(std::function<void(gpu::Batch& batch)> f);
 
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 24c16c1493..722ab341f7 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -68,6 +68,16 @@ glm::mat4 HmdDisplayPlugin::getCullingProjection(const glm::mat4& baseProjection
     return _cullingProjection; 
 }
 
+glm::ivec4 HmdDisplayPlugin::eyeViewport(Eye eye) const {
+    uvec2 vpSize = getRecommendedRenderSize();
+    vpSize.x /= 2;
+    uvec2 vpPos;
+    if (eye == Eye::Right) {
+        vpPos.x = vpSize.x;
+    }
+    return ivec4(vpPos, vpSize);
+}
+
 #define DISABLE_PREVIEW_MENU_ITEM_DELAY_MS 500
 
 bool HmdDisplayPlugin::internalActivate() {
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index 36810681ad..d34a70f722 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -34,6 +34,8 @@ public:
     glm::uvec2 getRecommendedRenderSize() const override final { return _renderTargetSize; }
     bool isDisplayVisible() const override { return isHmdMounted(); }
 
+    ivec4 eyeViewport(Eye eye) const;
+
     QRect getRecommendedHUDRect() const override final;
 
     virtual glm::mat4 getHeadPose() const override;
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index fd82567a94..3837be5c9c 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -29,7 +29,7 @@
 #include <PrioritySortUtil.h>
 #include <Rig.h>
 #include <SceneScriptingInterface.h>
-#include <ScriptEngine.h>
+#include <ScriptEngines.h>
 #include <EntitySimulation.h>
 #include <ZoneRenderer.h>
 #include <PhysicalEntitySimulation.h>
@@ -146,7 +146,7 @@ int EntityTreeRenderer::_entitiesScriptEngineCount = 0;
 void EntityTreeRenderer::resetEntitiesScriptEngine() {
     _entitiesScriptEngine = scriptEngineFactory(ScriptEngine::ENTITY_CLIENT_SCRIPT, NO_SCRIPT,
                                                 QString("about:Entities %1").arg(++_entitiesScriptEngineCount));
-    _scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine);
+    DependencyManager::get<ScriptEngines>()->runScriptInitializers(_entitiesScriptEngine);
     _entitiesScriptEngine->runInThread();
     auto entitiesScriptEngineProvider = qSharedPointerCast<EntitiesScriptEngineProvider>(_entitiesScriptEngine);
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
@@ -800,7 +800,7 @@ QUuid EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
     RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     EntityItemPointer entity;
     if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) {
-        if (!EntityTree::areEntityClicksCaptured()) {
+        if (!EntityTree::areEntityClicksCaptured() && event->button() == Qt::MouseButton::LeftButton) {
             auto properties = entity->getProperties();
             QString urlString = properties.getHref();
             QUrl url = QUrl(urlString, QUrl::StrictMode);
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 2697d30de4..d11f6dd6f4 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -108,15 +108,6 @@ protected:
     virtual void setIsVisibleInSecondaryCamera(bool value) { _isVisibleInSecondaryCamera = value; }
     virtual void setRenderLayer(RenderLayer value) { _renderLayer = value; }
     virtual void setPrimitiveMode(PrimitiveMode value) { _primitiveMode = value; }
-    
-    template <typename F, typename T>
-    T withReadLockResult(const std::function<T()>& f) {
-        T result;
-        withReadLock([&] {
-            result = f();
-        });
-        return result;
-    }
 
 signals:
     void requestRenderUpdate();
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 3574544bba..853e36b45b 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -72,7 +72,6 @@
 #include "EntityTreeRenderer.h"
 
 #include "RenderablePolyVoxEntityItem.h"
-#include "EntityEditPacketSender.h"
 #include "PhysicalEntitySimulation.h"
 
 const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
@@ -83,30 +82,60 @@ const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
   _voxelData -- compressed QByteArray representation of which voxels have which values
   _volData -- datastructure from the PolyVox library which holds which voxels have which values
   _mesh -- renderable representation of the voxels
-  _shape -- used for bullet collisions
+  _shape -- used for bullet (physics) collisions
 
   Each one depends on the one before it, except that _voxelData is set from _volData if a script edits the voxels.
 
   There are booleans to indicate that something has been updated and the dependents now need to be updated.
+  _meshReady       -- do we have something to give scripts that ask for the mesh?
+  _voxelDataDirty  -- do we need to uncompress data and expand it into _volData?
+  _volDataDirty    -- does recomputeMesh need to be called?
+  _shapeReady      -- are we ready to tell bullet our shape?
 
-  _voxelDataDirty
-  _volDataDirty
-  _meshDirty
 
-  In RenderablePolyVoxEntityItem::render, these flags are checked and changes are propagated along the chain.
-  decompressVolumeData() is called to decompress _voxelData into _volData.  recomputeMesh() is called to invoke the
-  polyVox surface extractor to create _mesh (as well as set Simulation _flags).  Because Simulation::DIRTY_SHAPE
-  is set, isReadyToComputeShape() gets called and _shape is created either from _volData or _shape, depending on
-  the surface style.
+  Here is a simplified diagram of the state machine implemented in RenderablePolyVoxEntityItem::update
 
-  When a script changes _volData, compressVolumeDataAndSendEditPacket is called to update _voxelData and to
-  send a packet to the entity-server.
+  +-------------------+
+  |                   |
+  |                   |
+  |  volDataDirty     |     voxelDataDirty
+  |                +--v--+
+  |         +------+Ready+--------+
+  |         |      +-----+        |
+  |         |                     |
+  |   +-----v----+         +------v------+
+  |   |BakingMesh|         |Uncompressing|
+  |   +-----+----+         +------+------+
+  |         |                     |
+  |         |                     |
+  |     +---v-------+     +-------v------------+
+  |     |Compressing|     |BakingMeshNoCompress|
+  |     +---------+-+     ++-------------------+
+  |               |        |
+  |               |        |
+  |             +-v--------v+
+  |             |BakingShape|
+  |             +-----+-----+
+  |                   |
+  +-------------------+
 
-  decompressVolumeData, recomputeMesh, computeShapeInfoWorker, and compressVolumeDataAndSendEditPacket are too expensive
-  to run on a thread that has other things to do.  These use QtConcurrent::run to spawn a thread.  As each thread
-  finishes, it adjusts the dirty flags so that the next call to render() will kick off the next step.
 
-  polyvoxes are designed to seemlessly fit up against neighbors.  If voxels go right up to the edge of polyvox,
+  The work for each step is done on temporary worker threads.  The PolyVox entity will update _updateNeeded and
+  enable or disable update calls on the entity, depending on if there is more work to do.
+
+  From the 'Ready' state, if we receive an update from the network, _voxelDataDirty will be set true.  We
+  uncompress the received data, bake the mesh (for the render-engine's benefit), and then compute the shape
+  (for the physics-engine's benefit).  This is the right-hand side of the diagram.
+
+  From the 'Ready' state, if a script changes a voxel, _volDataDirty will be set true.  We bake the mesh,
+  compress the voxels into a new _voxelData, and transmit the new _voxelData to the entity-server.  We then
+  bake the shape.  This is the left-hand side of the diagram.
+
+  The actual state machine is more complicated than the diagram, because it's possible for _volDataDirty or
+  _voxelDataDirty to be set true while worker threads are attempting to bake meshes or shapes.  If this happens,
+  we jump back to a higher point in the diagram to avoid wasting effort.
+
+  PolyVoxes are designed to seemlessly fit up against neighbors.  If voxels go right up to the edge of polyvox,
   the resulting mesh wont be closed -- the library assumes you'll have another polyvox next to it to continue the
   mesh.
 
@@ -114,8 +143,8 @@ const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
   previously mentioned gaps along the edges.
 
   Non-edged polyvox entities can be told about their neighbors in all 6 cardinal directions.  On the positive
-  edges of the polyvox, the values are set from the (negative edge of) relevant neighbor so that their meshes
-  knit together.  This is handled by bonkNeighbors and copyUpperEdgesFromNeighbors.  In these functions, variable
+  edges of the polyvox, the values are set from the (negative edge of the) relevant neighbor so that their meshes
+  knit together.  This is handled by tellNeighborsToRecopyEdges and copyUpperEdgesFromNeighbors.  In these functions, variable
   names have XP for x-positive, XN x-negative, etc.
 
  */
@@ -140,7 +169,8 @@ EntityItemPointer RenderablePolyVoxEntityItem::factory(const EntityItemID& entit
     return entity;
 }
 
-RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& entityItemID) : PolyVoxEntityItem(entityItemID) { }
+RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& entityItemID) : PolyVoxEntityItem(entityItemID) {
+}
 
 RenderablePolyVoxEntityItem::~RenderablePolyVoxEntityItem() {
     withWriteLock([&] {
@@ -165,11 +195,12 @@ bool isEdged(PolyVoxEntityItem::PolyVoxSurfaceStyle surfaceStyle) {
 }
 
 void RenderablePolyVoxEntityItem::setVoxelData(const QByteArray& voxelData) {
-    // compressed voxel information from the entity-server
+    // accept compressed voxel information from the entity-server
     withWriteLock([&] {
         if (_voxelData != voxelData) {
             _voxelData = voxelData;
             _voxelDataDirty = true;
+            startUpdates();
         }
     });
 }
@@ -189,21 +220,22 @@ void RenderablePolyVoxEntityItem::setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxel
         bool willBeEdged = isEdged(voxelSurfaceStyle);
 
         if (wasEdged != willBeEdged) {
-            _volDataDirty = true;
             _volData.reset();
-            _voxelSurfaceStyle = voxelSurfaceStyle;
             _voxelDataDirty = true;
             volSizeChanged = true;
-        } else {
-            _volDataDirty = true;
-            _voxelSurfaceStyle = voxelSurfaceStyle;
         }
+        _voxelSurfaceStyle = voxelSurfaceStyle;
+        startUpdates();
     });
 
     if (volSizeChanged) {
         // setVoxelVolumeSize will re-alloc _volData with the right size
         setVoxelVolumeSize(_voxelVolumeSize);
     }
+
+    _updateFromNeighborXEdge = _updateFromNeighborYEdge = _updateFromNeighborZEdge = true;
+    tellNeighborsToRecopyEdges(true);
+    startUpdates();
 }
 
 glm::vec3 RenderablePolyVoxEntityItem::getSurfacePositionAdjustment() const {
@@ -262,9 +294,6 @@ bool RenderablePolyVoxEntityItem::setVoxel(const ivec3& v, uint8_t toValue) {
     withWriteLock([&] {
         result = setVoxelInternal(v, toValue);
     });
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
 
     return result;
 }
@@ -311,9 +340,6 @@ bool RenderablePolyVoxEntityItem::setAll(uint8_t toValue) {
             result |= setVoxelInternal(v, toValue);
         });
     });
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
     return result;
 }
 
@@ -336,9 +362,6 @@ bool RenderablePolyVoxEntityItem::setCuboid(const glm::vec3& lowPosition, const
             result |= setVoxelInternal(v, toValue);
         });
     });
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
     return result;
 }
 
@@ -374,9 +397,6 @@ bool RenderablePolyVoxEntityItem::setSphereInVolume(const vec3& center, float ra
         });
     });
 
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
     return result;
 }
 
@@ -434,9 +454,6 @@ bool RenderablePolyVoxEntityItem::setSphere(const vec3& centerWorldCoords, float
         });
     });
 
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
     return result;
 }
 
@@ -482,9 +499,6 @@ bool RenderablePolyVoxEntityItem::setCapsule(const vec3& startWorldCoords, const
         });
     });
 
-    if (result) {
-        compressVolumeDataAndSendEditPacket();
-    }
     return result;
 }
 
@@ -710,8 +724,9 @@ ShapeType RenderablePolyVoxEntityItem::getShapeType() const {
 
 void RenderablePolyVoxEntityItem::setRegistrationPoint(const glm::vec3& value) {
     if (value != _registrationPoint) {
-        _meshDirty = true;
+        _shapeReady = false;
         EntityItem::setRegistrationPoint(value);
+        startUpdates();
     }
 }
 
@@ -721,15 +736,11 @@ bool RenderablePolyVoxEntityItem::isReadyToComputeShape() const {
         return true;
     }
 
-    // we determine if we are ready to compute the physics shape by actually doing so.
-    // if _voxelDataDirty or _volDataDirty is set, don't do this yet -- wait for their
-    // threads to finish before creating the collision shape.
-    if (_meshDirty && !_voxelDataDirty && !_volDataDirty) {
-        const_cast<RenderablePolyVoxEntityItem*>(this)->_meshDirty = false;
-        const_cast<RenderablePolyVoxEntityItem*>(this)->computeShapeInfoWorker();
-        return false;
-    }
-    return true;
+    bool result;
+    withReadLock([&] {
+        result = _shapeReady;
+    });
+    return result;
 }
 
 void RenderablePolyVoxEntityItem::computeShapeInfo(ShapeInfo& info) {
@@ -739,33 +750,155 @@ void RenderablePolyVoxEntityItem::computeShapeInfo(ShapeInfo& info) {
         return;
     }
 
-    // the shape was actually computed in isReadyToComputeShape.  Just hand it off, here.
-    withWriteLock([&] {
+    withReadLock([&] {
         info = _shapeInfo;
     });
 }
 
-bool RenderablePolyVoxEntityItem::updateDependents() {
-    bool voxelDataDirty;
-    bool volDataDirty;
+void RenderablePolyVoxEntityItem::changeUpdates(bool value) {
+    if (_updateNeeded != value) {
+        EntityTreePointer entityTree = getTree();
+        if (entityTree) {
+            EntitySimulationPointer simulation = entityTree->getSimulation();
+            if (simulation) {
+                _updateNeeded = value;
+                _flags |= Simulation::DIRTY_UPDATEABLE;
+                simulation->changeEntity(getThisPointer());
+            }
+        }
+    }
+}
+
+void RenderablePolyVoxEntityItem::startUpdates() {
+    changeUpdates(true);
+}
+
+void RenderablePolyVoxEntityItem::stopUpdates() {
+    changeUpdates(false);
+}
+
+void RenderablePolyVoxEntityItem::update(const quint64& now) {
+    bool doRecomputeMesh { false };
+    bool doUncompress { false };
+    bool doCompress { false };
+    bool doRecomputeShape { false };
+
     withWriteLock([&] {
-        voxelDataDirty = _voxelDataDirty;
-        volDataDirty = _volDataDirty;
-        if (_voxelDataDirty) {
-            _voxelDataDirty = false;
-        } else if (_volDataDirty) {
-            _volDataDirty = false;
-        } else {
-            _meshReady = true;
+        tellNeighborsToRecopyEdges(false);
+
+        switch (_state) {
+
+            case PolyVoxState::Ready: {
+                if (_volDataDirty) {
+                    _volDataDirty = _voxelDataDirty = false;
+                    _state = PolyVoxState::BakingMesh;
+                    doRecomputeMesh = true;
+                } else if (_voxelDataDirty) {
+                    _voxelDataDirty = false;
+                    _state = PolyVoxState::Uncompressing;
+                    doUncompress = true;
+                } else {
+                    copyUpperEdgesFromNeighbors();
+                    if (!_volDataDirty && !_voxelDataDirty) {
+                        // nothing to do
+                        stopUpdates();
+                    }
+                }
+                break;
+            }
+
+            case PolyVoxState::Uncompressing: {
+                break; // wait
+            }
+            case PolyVoxState::UncompressingFinished: {
+                if (_volDataDirty) {
+                    _volDataDirty = _voxelDataDirty = false;
+                    _state = PolyVoxState::BakingMeshNoCompress;
+                    doRecomputeMesh = true;
+                } else if (_voxelDataDirty) {
+                    _voxelDataDirty = false;
+                    // _voxelData changed while we were uncompressing the previous version, uncompress again
+                    _state = PolyVoxState::Uncompressing;
+                    doUncompress = true;
+                } else {
+                    _state = PolyVoxState::Ready;
+                }
+                break;
+            }
+
+            case PolyVoxState::BakingMesh: {
+                break; // wait
+            }
+            case PolyVoxState::BakingMeshFinished: {
+                if (_volDataDirty) {
+                    _volDataDirty = _voxelDataDirty = false;
+                    _state = PolyVoxState::BakingMesh;
+                    // a local edit happened while we were baking the mesh.  rebake mesh...
+                    doRecomputeMesh = true;
+                } else if (_voxelDataDirty) {
+                    _voxelDataDirty = false;
+                    // we received a change from the wire while baking the mesh.
+                    _state = PolyVoxState::Uncompressing;
+                    doUncompress = true;
+                } else {
+                    _state = PolyVoxState::Compressing;
+                    doCompress = true;
+                }
+                break;
+            }
+
+            case PolyVoxState::BakingMeshNoCompress: {
+                break; // wait
+            }
+            case PolyVoxState::BakingMeshNoCompressFinished: {
+                if (_volDataDirty) {
+                    _volDataDirty = _voxelDataDirty = false;
+                    _state = PolyVoxState::BakingMesh;
+                    // a local edit happened while we were baking the mesh.  rebake mesh...
+                    doRecomputeMesh = true;
+                } else if (_voxelDataDirty) {
+                    _voxelDataDirty = false;
+                    // we received a change from the wire while baking the mesh.
+                    _state = PolyVoxState::Uncompressing;
+                    doUncompress = true;
+                } else {
+                    _state = PolyVoxState::BakingShape;
+                    doRecomputeShape = true;
+                }
+                break;
+            }
+
+            case PolyVoxState::Compressing: {
+                break; // wait
+            }
+            case PolyVoxState::CompressingFinished: {
+                _state = PolyVoxState::BakingShape;
+                doRecomputeShape = true;
+                break;
+            }
+
+            case PolyVoxState::BakingShape: {
+                break; // wait
+            }
+            case PolyVoxState::BakingShapeFinished: {
+                _state = PolyVoxState::Ready;
+                break;
+            }
         }
     });
-    if (voxelDataDirty) {
-        decompressVolumeData();
-    } else if (volDataDirty) {
+
+    if (doRecomputeMesh) {
         recomputeMesh();
     }
-
-    return !volDataDirty;
+    if (doUncompress) {
+        uncompressVolumeData();
+    }
+    if (doCompress) {
+        compressVolumeDataAndSendEditPacket();
+    }
+    if (doRecomputeShape) {
+        computeShapeInfoWorker();
+    }
 }
 
 void RenderablePolyVoxEntityItem::setVoxelVolumeSize(const glm::vec3& voxelVolumeSize) {
@@ -782,6 +915,8 @@ void RenderablePolyVoxEntityItem::setVoxelVolumeSize(const glm::vec3& voxelVolum
         _voxelVolumeSize = voxelVolumeSize;
         _volData.reset();
         _onCount = 0;
+        _updateFromNeighborXEdge = _updateFromNeighborYEdge = _updateFromNeighborZEdge = true;
+        startUpdates();
 
         static const PolyVox::Vector3DInt32 lowCorner(0, 0, 0);
         PolyVox::Vector3DInt32 highCorner;
@@ -806,6 +941,8 @@ void RenderablePolyVoxEntityItem::setVoxelVolumeSize(const glm::vec3& voxelVolum
         // having the "outside of voxel-space" value be 255 has helped me notice some problems.
         _volData->setBorderValue(255);
     });
+
+    tellNeighborsToRecopyEdges(true);
 }
 
 bool inUserBounds(const std::shared_ptr<PolyVox::SimpleVolume<uint8_t>> vol,
@@ -853,32 +990,38 @@ uint8_t RenderablePolyVoxEntityItem::getVoxelInternal(const ivec3& v) const {
 }
 
 
+void RenderablePolyVoxEntityItem::setVoxelMarkNeighbors(int x, int y, int z, uint8_t toValue) {
+    _volData->setVoxelAt(x, y, z, toValue);
+    if (x == 0) {
+        _neighborXNeedsUpdate = true;
+        startUpdates();
+    }
+    if (y == 0) {
+        _neighborYNeedsUpdate = true;
+        startUpdates();
+    }
+    if (z == 0) {
+        _neighborZNeedsUpdate = true;
+        startUpdates();
+    }
+}
+
 bool RenderablePolyVoxEntityItem::setVoxelInternal(const ivec3& v, uint8_t toValue) {
-    // set a voxel without recompressing the voxel data.  This assumes that the caller has
-    // write-locked the entity.
-    bool result = false;
-    if (!inUserBounds(_volData, _voxelSurfaceStyle, v)) {
-        return result;
+    // set a voxel without recompressing the voxel data.  This assumes that the caller has write-locked the entity.
+    bool result = updateOnCount(v, toValue);
+    if (result) {
+        if (isEdged()) {
+            setVoxelMarkNeighbors(v.x + 1, v.y + 1, v.z + 1, toValue);
+        } else {
+            setVoxelMarkNeighbors(v.x, v.y, v.z, toValue);
+        }
+        _volDataDirty = true;
+        startUpdates();
     }
 
-    result = updateOnCount(v, toValue);
-
-    if (isEdged()) {
-        _volData->setVoxelAt(v.x + 1, v.y + 1, v.z + 1, toValue);
-    } else {
-        _volData->setVoxelAt(v.x, v.y, v.z, toValue);
-    }
-
-    if (glm::any(glm::equal(ivec3(0), v))) {
-        _neighborsNeedUpdate = true;
-    }
-
-    _volDataDirty |= result;
-
     return result;
 }
 
-
 bool RenderablePolyVoxEntityItem::updateOnCount(const ivec3& v, uint8_t toValue) {
     // keep _onCount up to date
     if (!inUserBounds(_volData, _voxelSurfaceStyle, v)) {
@@ -902,7 +1045,7 @@ bool RenderablePolyVoxEntityItem::updateOnCount(const ivec3& v, uint8_t toValue)
     return false;
 }
 
-void RenderablePolyVoxEntityItem::decompressVolumeData() {
+void RenderablePolyVoxEntityItem::uncompressVolumeData() {
     // take compressed data and expand it into _volData.
     QByteArray voxelData;
     auto entity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(getThisPointer());
@@ -921,9 +1064,9 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
         if (voxelXSize == 0 || voxelXSize > PolyVoxEntityItem::MAX_VOXEL_DIMENSION ||
             voxelYSize == 0 || voxelYSize > PolyVoxEntityItem::MAX_VOXEL_DIMENSION ||
             voxelZSize == 0 || voxelZSize > PolyVoxEntityItem::MAX_VOXEL_DIMENSION) {
-            qCDebug(entitiesrenderer) << "voxelSize is not reasonable, skipping decompressions."
-                     << voxelXSize << voxelYSize << voxelZSize << getName() << getID();
-            entity->setVoxelDataDirty(false);
+            qCDebug(entitiesrenderer) << "voxelSize is not reasonable, skipping uncompressions."
+                                      << voxelXSize << voxelYSize << voxelZSize << getName() << getID();
+            entity->setVoxelsFromData(QByteArray(1, 0), 1, 1, 1);
             return;
         }
         int rawSize = voxelXSize * voxelYSize * voxelZSize;
@@ -934,10 +1077,10 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
         QByteArray uncompressedData = qUncompress(compressedData);
 
         if (uncompressedData.size() != rawSize) {
-            qCDebug(entitiesrenderer) << "PolyVox decompress -- size is (" << voxelXSize << voxelYSize << voxelZSize << ")"
+            qCDebug(entitiesrenderer) << "PolyVox uncompress -- size is (" << voxelXSize << voxelYSize << voxelZSize << ")"
                      << "so expected uncompressed length of" << rawSize << "but length is" << uncompressedData.size()
-                     << getName() << getID();
-            entity->setVoxelDataDirty(false);
+                                      << getName() << getID();
+            entity->setVoxelsFromData(QByteArray(1, 0), 1, 1, 1);
             return;
         }
 
@@ -947,13 +1090,14 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
 
 void RenderablePolyVoxEntityItem::setVoxelsFromData(QByteArray uncompressedData,
                                                     quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize) {
-    // this accepts the payload from decompressVolumeData
+    // this accepts the payload from uncompressVolumeData
     withWriteLock([&] {
         loop3(ivec3(0), ivec3(voxelXSize, voxelYSize, voxelZSize), [&](const ivec3& v) {
             int uncompressedIndex = (v.z * voxelYSize * voxelXSize) + (v.y * voxelZSize) + v.x;
             setVoxelInternal(v, uncompressedData[uncompressedIndex]);
         });
-        _volDataDirty = true;
+
+        _state = PolyVoxState::UncompressingFinished;
     });
 }
 
@@ -972,10 +1116,7 @@ void RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket() {
         voxelZSize = _voxelVolumeSize.z;
     });
 
-    EntityTreeElementPointer element = getElement();
-    EntityTreePointer tree = element ? element->getTree() : nullptr;
-
-    QtConcurrent::run([voxelXSize, voxelYSize, voxelZSize, entity, tree] {
+    QtConcurrent::run([voxelXSize, voxelYSize, voxelZSize, entity] {
         auto polyVoxEntity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity);
         QByteArray uncompressedData = polyVoxEntity->volDataToArray(voxelXSize, voxelYSize, voxelZSize);
 
@@ -992,17 +1133,37 @@ void RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket() {
             // HACK -- until we have a way to allow for properties larger than MTU, don't update.
             // revert the active voxel-space to the last version that fit.
             qCDebug(entitiesrenderer) << "compressed voxel data is too large" << entity->getName() << entity->getID();
+
+            const auto polyVoxEntity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity);
+            polyVoxEntity->compressVolumeDataFinished(QByteArray());
             return;
         }
 
-        auto now = usecTimestampNow();
-        entity->setLastEdited(now);
-        entity->setLastBroadcast(now);
+        std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->compressVolumeDataFinished(newVoxelData);
+    });
+}
 
-        std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->setVoxelData(newVoxelData);
+void RenderablePolyVoxEntityItem::compressVolumeDataFinished(const QByteArray& voxelData) {
+    // compressed voxel information from the entity-server
+    withWriteLock([&] {
+        if (voxelData.size() > 0 && _voxelData != voxelData) {
+            _voxelData = voxelData;
+        }
+        _state = PolyVoxState::CompressingFinished;
+    });
 
+    auto now = usecTimestampNow();
+    setLastEdited(now);
+    setLastBroadcast(now);
+
+    EntityTreeElementPointer element = getElement();
+    EntityTreePointer tree = element ? element->getTree() : nullptr;
+
+    if (tree) {
         tree->withReadLock([&] {
-            EntityItemProperties properties = entity->getProperties();
+            EntityPropertyFlags desiredProperties;
+            desiredProperties.setHasProperty(PROP_VOXEL_DATA);
+            EntityItemProperties properties = getProperties(desiredProperties, false);
             properties.setVoxelDataDirty();
             properties.setLastEdited(now);
 
@@ -1010,12 +1171,13 @@ void RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket() {
             PhysicalEntitySimulationPointer peSimulation = std::static_pointer_cast<PhysicalEntitySimulation>(simulation);
             EntityEditPacketSender* packetSender = peSimulation ? peSimulation->getPacketSender() : nullptr;
             if (packetSender) {
-                packetSender->queueEditEntityMessage(PacketType::EntityEdit, tree, entity->getID(), properties);
+                packetSender->queueEditEntityMessage(PacketType::EntityEdit, tree, getID(), properties);
             }
         });
-    });
+    }
 }
 
+
 EntityItemPointer lookUpNeighbor(EntityTreePointer tree, EntityItemID neighborID, EntityItemWeakPointer& currentWP) {
     EntityItemPointer current = currentWP.lock();
 
@@ -1064,56 +1226,103 @@ void RenderablePolyVoxEntityItem::copyUpperEdgesFromNeighbors() {
         return;
     }
 
-    auto currentXPNeighbor = getXPNeighbor();
-    auto currentYPNeighbor = getYPNeighbor();
-    auto currentZPNeighbor = getZPNeighbor();
-
-    if (currentXPNeighbor && currentXPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
-        withWriteLock([&] {
-            for (int y = 0; y < _volData->getHeight(); y++) {
-                for (int z = 0; z < _volData->getDepth(); z++) {
-                    uint8_t neighborValue = currentXPNeighbor->getVoxel({ 0, y, z });
-                    if ((y == 0 || z == 0) && _volData->getVoxelAt(_volData->getWidth() - 1, y, z) != neighborValue) {
-                        bonkNeighbors();
-                    }
-                    _volData->setVoxelAt(_volData->getWidth() - 1, y, z, neighborValue);
-                }
-            }
-        });
+    if (!_updateFromNeighborXEdge && !_updateFromNeighborYEdge && !_updateFromNeighborZEdge) {
+        return;
     }
 
+    cacheNeighbors();
 
-    if (currentYPNeighbor && currentYPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
-        withWriteLock([&] {
-            for (int x = 0; x < _volData->getWidth(); x++) {
-                for (int z = 0; z < _volData->getDepth(); z++) {
-                    uint8_t neighborValue = currentYPNeighbor->getVoxel({ x, 0, z });
-                    if ((x == 0 || z == 0) && _volData->getVoxelAt(x, _volData->getHeight() - 1, z) != neighborValue) {
-                        bonkNeighbors();
-                    }
-                    _volData->setVoxelAt(x, _volData->getHeight() - 1, z, neighborValue);
-                }
-            }
-        });
-    }
-
-
-    if (currentZPNeighbor && currentZPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
-        withWriteLock([&] {
-            for (int x = 0; x < _volData->getWidth(); x++) {
+    if (_updateFromNeighborXEdge) {
+        _updateFromNeighborXEdge = false;
+        auto currentXPNeighbor = getXPNeighbor();
+        if (currentXPNeighbor && currentXPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
+            withWriteLock([&] {
+                int x = _volData->getWidth() - 1;
                 for (int y = 0; y < _volData->getHeight(); y++) {
-                    uint8_t neighborValue = currentZPNeighbor->getVoxel({ x, y, 0 });
-                    _volData->setVoxelAt(x, y, _volData->getDepth() - 1, neighborValue);
-                    if ((x == 0 || y == 0) && _volData->getVoxelAt(x, y, _volData->getDepth() - 1) != neighborValue) {
-                        bonkNeighbors();
+                    for (int z = 0; z < _volData->getDepth(); z++) {
+                        uint8_t neighborValue = currentXPNeighbor->getVoxel({ 0, y, z });
+                        uint8_t prevValue = _volData->getVoxelAt(x, y, z);
+                        if (prevValue != neighborValue) {
+                            _volData->setVoxelAt(x, y, z, neighborValue);
+                            _volDataDirty = true;
+                        }
                     }
-                    _volData->setVoxelAt(x, y, _volData->getDepth() - 1, neighborValue);
                 }
-            }
-        });
+            });
+        }
+    }
+
+    if (_updateFromNeighborYEdge) {
+        _updateFromNeighborYEdge = false;
+        auto currentYPNeighbor = getYPNeighbor();
+        if (currentYPNeighbor && currentYPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
+            withWriteLock([&] {
+                int y = _volData->getHeight() - 1;
+                for (int x = 0; x < _volData->getWidth(); x++) {
+                    for (int z = 0; z < _volData->getDepth(); z++) {
+                        uint8_t neighborValue = currentYPNeighbor->getVoxel({ x, 0, z });
+                        uint8_t prevValue = _volData->getVoxelAt(x, y, z);
+                        if (prevValue != neighborValue) {
+                            _volData->setVoxelAt(x, y, z, neighborValue);
+                            _volDataDirty = true;
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    if (_updateFromNeighborZEdge) {
+        _updateFromNeighborZEdge = false;
+        auto currentZPNeighbor = getZPNeighbor();
+        if (currentZPNeighbor && currentZPNeighbor->getVoxelVolumeSize() == _voxelVolumeSize) {
+            withWriteLock([&] {
+                int z = _volData->getDepth() - 1;
+                for (int x = 0; x < _volData->getWidth(); x++) {
+                    for (int y = 0; y < _volData->getHeight(); y++) {
+                        uint8_t neighborValue = currentZPNeighbor->getVoxel({ x, y, 0 });
+                        uint8_t prevValue = _volData->getVoxelAt(x, y, z);
+                        if (prevValue != neighborValue) {
+                            _volData->setVoxelAt(x, y, z, neighborValue);
+                            _volDataDirty = true;
+                        }
+                    }
+                }
+            });
+        }
     }
 }
 
+void RenderablePolyVoxEntityItem::tellNeighborsToRecopyEdges(bool force) {
+    // if this polyvox has changed any of its voxels with a zero coord (in x, y, or z) notify neighbors, if there are any
+    if (force || _neighborXNeedsUpdate || _neighborYNeedsUpdate || _neighborZNeedsUpdate) {
+        cacheNeighbors();
+
+        if (force || _neighborXNeedsUpdate) {
+            _neighborXNeedsUpdate = false;
+            auto currentXNNeighbor = getXNNeighbor();
+            if (currentXNNeighbor) {
+                currentXNNeighbor->neighborXEdgeChanged();
+            }
+        }
+        if (force || _neighborYNeedsUpdate) {
+            _neighborYNeedsUpdate = false;
+            auto currentYNNeighbor = getYNNeighbor();
+            if (currentYNNeighbor) {
+                currentYNNeighbor->neighborYEdgeChanged();
+            }
+        }
+        if (force || _neighborZNeedsUpdate) {
+            _neighborZNeedsUpdate = false;
+            auto currentZNNeighbor = getZNNeighbor();
+            if (currentZNNeighbor) {
+                currentZNNeighbor->neighborZEdgeChanged();
+            }
+        }
+    }
+}
+
+
 void RenderablePolyVoxEntityItem::recomputeMesh() {
     // use _volData to make a renderable mesh
     PolyVoxSurfaceStyle voxelSurfaceStyle;
@@ -1121,9 +1330,6 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
         voxelSurfaceStyle = _voxelSurfaceStyle;
     });
 
-    cacheNeighbors();
-    copyUpperEdgesFromNeighbors();
-
     auto entity = std::static_pointer_cast<RenderablePolyVoxEntityItem>(getThisPointer());
 
     QtConcurrent::run([entity, voxelSurfaceStyle] {
@@ -1135,24 +1341,14 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
         entity->withReadLock([&] {
             PolyVox::SimpleVolume<uint8_t>* volData = entity->getVolData();
             switch (voxelSurfaceStyle) {
-                case PolyVoxEntityItem::SURFACE_EDGED_MARCHING_CUBES: {
-                    PolyVox::MarchingCubesSurfaceExtractor<PolyVox::SimpleVolume<uint8_t>> surfaceExtractor
-                        (volData, volData->getEnclosingRegion(), &polyVoxMesh);
-                    surfaceExtractor.execute();
-                    break;
-                }
+                case PolyVoxEntityItem::SURFACE_EDGED_MARCHING_CUBES:
                 case PolyVoxEntityItem::SURFACE_MARCHING_CUBES: {
                     PolyVox::MarchingCubesSurfaceExtractor<PolyVox::SimpleVolume<uint8_t>> surfaceExtractor
                         (volData, volData->getEnclosingRegion(), &polyVoxMesh);
                     surfaceExtractor.execute();
                     break;
                 }
-                case PolyVoxEntityItem::SURFACE_EDGED_CUBIC: {
-                    PolyVox::CubicSurfaceExtractorWithNormals<PolyVox::SimpleVolume<uint8_t>> surfaceExtractor
-                        (volData, volData->getEnclosingRegion(), &polyVoxMesh);
-                    surfaceExtractor.execute();
-                    break;
-                }
+                case PolyVoxEntityItem::SURFACE_EDGED_CUBIC:
                 case PolyVoxEntityItem::SURFACE_CUBIC: {
                     PolyVox::CubicSurfaceExtractorWithNormals<PolyVox::SimpleVolume<uint8_t>> surfaceExtractor
                         (volData, volData->getEnclosingRegion(), &polyVoxMesh);
@@ -1180,7 +1376,6 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
                                          gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
         mesh->setVertexBuffer(vertexBufferView);
 
-
         // TODO -- use 3-byte normals rather than 3-float normals
         mesh->addAttribute(gpu::Stream::NORMAL,
                            gpu::BufferView(vertexBufferPtr,
@@ -1194,28 +1389,24 @@ void RenderablePolyVoxEntityItem::recomputeMesh() {
                                              (graphics::Index)vecIndices.size(), // numIndices
                                              (graphics::Index)0, // baseVertex
                                              graphics::Mesh::TRIANGLES)); // topology
-        mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
-                                                            (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
+        mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part), (gpu::Byte*) parts.data()),
+                                            gpu::Element::PART_DRAWCALL));
         entity->setMesh(mesh);
     });
 }
 
 void RenderablePolyVoxEntityItem::setMesh(graphics::MeshPointer mesh) {
     // this catches the payload from recomputeMesh
-    bool neighborsNeedUpdate;
     withWriteLock([&] {
         if (!_collisionless) {
             _flags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
         }
+        _shapeReady = false;
         _mesh = mesh;
-        _meshDirty = true;
+        _state = PolyVoxState::BakingMeshFinished;
         _meshReady = true;
-        neighborsNeedUpdate = _neighborsNeedUpdate;
-        _neighborsNeedUpdate = false;
+        startUpdates();
     });
-    if (neighborsNeedUpdate) {
-        bonkNeighbors();
-    }
 
     somethingChangedNotification();
 }
@@ -1223,9 +1414,6 @@ void RenderablePolyVoxEntityItem::setMesh(graphics::MeshPointer mesh) {
 void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
     // this creates a collision-shape for the physics engine.  The shape comes from
     // _volData for cubic extractors and from _mesh for marching-cube extractors
-    if (!_meshReady) {
-        return;
-    }
 
     EntityItemPointer entity = getThisPointer();
 
@@ -1295,8 +1483,8 @@ void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
                     const auto& x = v.x;
                     const auto& y = v.y;
                     const auto& z = v.z;
-                    if (glm::all(glm::greaterThan(v, ivec3(0))) && 
-                        glm::all(glm::lessThan(v, ivec3(voxelVolumeSize) - 1)) && 
+                    if (glm::all(glm::greaterThan(v, ivec3(0))) &&
+                        glm::all(glm::lessThan(v, ivec3(voxelVolumeSize) - 1)) &&
                         (polyVoxEntity->getVoxelInternal({ x - 1, y, z }) > 0) &&
                         (polyVoxEntity->getVoxelInternal({ x, y - 1, z }) > 0) &&
                         (polyVoxEntity->getVoxelInternal({ x, y, z - 1 }) > 0) &&
@@ -1360,6 +1548,10 @@ void RenderablePolyVoxEntityItem::setCollisionPoints(ShapeInfo::PointCollection
     // this catches the payload from computeShapeInfoWorker
     if (pointCollection.isEmpty()) {
         EntityItem::computeShapeInfo(_shapeInfo);
+        withWriteLock([&] {
+            _shapeReady = true;
+            _state = PolyVoxState::BakingShapeFinished;
+        });
         return;
     }
 
@@ -1373,7 +1565,8 @@ void RenderablePolyVoxEntityItem::setCollisionPoints(ShapeInfo::PointCollection
             QString::number(_registrationPoint.z);
         _shapeInfo.setParams(SHAPE_TYPE_COMPOUND, collisionModelDimensions, shapeKey);
         _shapeInfo.setPointCollection(pointCollection);
-        _meshDirty = false;
+        _shapeReady = true;
+        _state = PolyVoxState::BakingShapeFinished;
     });
 }
 
@@ -1384,7 +1577,8 @@ void RenderablePolyVoxEntityItem::setXNNeighborID(const EntityItemID& xNNeighbor
 
     if (xNNeighborID != _xNNeighborID) {
         PolyVoxEntityItem::setXNNeighborID(xNNeighborID);
-        cacheNeighbors();
+        _neighborXNeedsUpdate = true;
+        startUpdates();
     }
 }
 
@@ -1395,7 +1589,8 @@ void RenderablePolyVoxEntityItem::setYNNeighborID(const EntityItemID& yNNeighbor
 
     if (yNNeighborID != _yNNeighborID) {
         PolyVoxEntityItem::setYNNeighborID(yNNeighborID);
-        cacheNeighbors();
+        _neighborYNeedsUpdate = true;
+        startUpdates();
     }
 }
 
@@ -1406,7 +1601,8 @@ void RenderablePolyVoxEntityItem::setZNNeighborID(const EntityItemID& zNNeighbor
 
     if (zNNeighborID != _zNNeighborID) {
         PolyVoxEntityItem::setZNNeighborID(zNNeighborID);
-        cacheNeighbors();
+        _neighborZNeedsUpdate = true;
+        startUpdates();
     }
 }
 
@@ -1416,7 +1612,8 @@ void RenderablePolyVoxEntityItem::setXPNeighborID(const EntityItemID& xPNeighbor
     }
     if (xPNeighborID != _xPNeighborID) {
         PolyVoxEntityItem::setXPNeighborID(xPNeighborID);
-        _volDataDirty = true;
+        _updateFromNeighborXEdge = true;
+        startUpdates();
     }
 }
 
@@ -1426,7 +1623,8 @@ void RenderablePolyVoxEntityItem::setYPNeighborID(const EntityItemID& yPNeighbor
     }
     if (yPNeighborID != _yPNeighborID) {
         PolyVoxEntityItem::setYPNeighborID(yPNeighborID);
-        _volDataDirty = true;
+        _updateFromNeighborYEdge = true;
+        startUpdates();
     }
 }
 
@@ -1436,7 +1634,8 @@ void RenderablePolyVoxEntityItem::setZPNeighborID(const EntityItemID& zPNeighbor
     }
     if (zPNeighborID != _zPNeighborID) {
         PolyVoxEntityItem::setZPNeighborID(zPNeighborID);
-        _volDataDirty = true;
+        _updateFromNeighborZEdge = true;
+        startUpdates();
     }
 }
 
@@ -1464,31 +1663,8 @@ std::shared_ptr<RenderablePolyVoxEntityItem> RenderablePolyVoxEntityItem::getZPN
     return std::dynamic_pointer_cast<RenderablePolyVoxEntityItem>(_zPNeighbor.lock());
 }
 
-void RenderablePolyVoxEntityItem::bonkNeighbors() {
-    // flag neighbors to the negative of this entity as needing to rebake their meshes.
-    cacheNeighbors();
-
-    auto currentXNNeighbor = getXNNeighbor();
-    auto currentYNNeighbor = getYNNeighbor();
-    auto currentZNNeighbor = getZNNeighbor();
-
-    if (currentXNNeighbor) {
-        currentXNNeighbor->setVolDataDirty();
-    }
-    if (currentYNNeighbor) {
-        currentYNNeighbor->setVolDataDirty();
-    }
-    if (currentZNNeighbor) {
-        currentZNNeighbor->setVolDataDirty();
-    }
-}
-
 // deprecated
 bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
-    if (!updateDependents()) {
-        return false;
-    }
-
     bool success = false;
     if (_mesh) {
         MeshProxy* meshProxy = nullptr;
@@ -1517,7 +1693,7 @@ bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
 }
 
 scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel() {
-    if (!updateDependents() || !_mesh) {
+    if (!_mesh) {
         return scriptable::ScriptableModelBase();
     }
 
@@ -1628,9 +1804,6 @@ bool PolyVoxEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPo
 }
 
 void PolyVoxEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
-    if (entity->_voxelDataDirty || entity->_volDataDirty) {
-        entity->updateDependents();
-    }
 
 #ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
     if (!_hasTransitioned) {
@@ -1662,7 +1835,6 @@ void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPoi
     graphics::MeshPointer newMesh;
     entity->withReadLock([&] {
         newMesh = entity->_mesh;
-
     });
 
     if (newMesh && newMesh->getIndexBuffer()._buffer) {
@@ -1705,3 +1877,41 @@ void PolyVoxEntityRenderer::doRender(RenderArgs* args) {
     batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)_mesh->getNumIndices(), 0);
 }
 
+QDebug operator<<(QDebug debug, PolyVoxState state) {
+    switch (state) {
+        case PolyVoxState::Ready:
+            debug << "Ready";
+            break;
+        case PolyVoxState::Uncompressing:
+            debug << "Uncompressing";
+            break;
+        case PolyVoxState::UncompressingFinished:
+            debug << "UncompressingFinished";
+            break;
+        case PolyVoxState::BakingMesh:
+            debug << "BakingMesh";
+            break;
+        case PolyVoxState::BakingMeshFinished:
+            debug << "BakingMeshFinished";
+            break;
+        case PolyVoxState::BakingMeshNoCompress:
+            debug << "BakingMeshNoCompress";
+            break;
+        case PolyVoxState::BakingMeshNoCompressFinished:
+            debug << "BakingMeshNoCompressFinished";
+            break;
+        case PolyVoxState::Compressing:
+            debug << "Compressing";
+            break;
+        case PolyVoxState::CompressingFinished:
+            debug << "CompressingFinished";
+            break;
+        case PolyVoxState::BakingShape:
+            debug << "BakingShape";
+            break;
+        case PolyVoxState::BakingShapeFinished:
+            debug << "BakingShapeFinished";
+            break;
+    }
+    return debug;
+}
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index cca34767a4..c322959f86 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -30,7 +30,25 @@
 
 namespace render { namespace entities {
 class PolyVoxEntityRenderer;
-} } 
+} }
+
+
+enum class PolyVoxState {
+    Ready,
+    Uncompressing,
+    UncompressingFinished,
+    BakingMesh,
+    BakingMeshFinished,
+    BakingMeshNoCompress,
+    BakingMeshNoCompressFinished,
+    Compressing,
+    CompressingFinished,
+    BakingShape,
+    BakingShapeFinished
+};
+
+QDebug operator<<(QDebug debug, PolyVoxState state);
+
 
 class RenderablePolyVoxEntityItem : public PolyVoxEntityItem, public scriptable::ModelProvider {
     friend class render::entities::PolyVoxEntityRenderer;
@@ -113,41 +131,61 @@ public:
 
     uint8_t getVoxelInternal(const ivec3& v) const;
     bool setVoxelInternal(const ivec3& v, uint8_t toValue);
+    void setVoxelMarkNeighbors(int x, int y, int z, uint8_t toValue);
 
-    void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
+    void compressVolumeDataFinished(const QByteArray& voxelData);
+    void neighborXEdgeChanged() { withWriteLock([&] { _updateFromNeighborXEdge = true; }); startUpdates(); }
+    void neighborYEdgeChanged() { withWriteLock([&] { _updateFromNeighborYEdge = true; }); startUpdates(); }
+    void neighborZEdgeChanged() { withWriteLock([&] { _updateFromNeighborZEdge = true; }); startUpdates(); }
 
     bool getMeshes(MeshProxyList& result) override; // deprecated
     virtual scriptable::ScriptableModelBase getScriptableModel() override;
 
+    virtual void update(const quint64& now) override;
+    bool needsToCallUpdate() const override { return _updateNeeded; }
+
 private:
     bool updateOnCount(const ivec3& v, uint8_t toValue);
     PolyVox::RaycastResult doRayCast(glm::vec4 originInVoxel, glm::vec4 farInVoxel, glm::vec4& result) const;
 
+    void changeUpdates(bool value);
+    void startUpdates();
+    void stopUpdates();
+
     void recomputeMesh();
     void cacheNeighbors();
     void copyUpperEdgesFromNeighbors();
-    void bonkNeighbors();
+    void tellNeighborsToRecopyEdges(bool force);
     bool updateDependents();
 
     // these are run off the main thread
-    void decompressVolumeData();
+    void uncompressVolumeData();
     void compressVolumeDataAndSendEditPacket();
     void computeShapeInfoWorker();
 
     // The PolyVoxEntityItem class has _voxelData which contains dimensions and compressed voxel data.  The dimensions
     // may not match _voxelVolumeSize.
-    bool _meshDirty { true }; // does collision-shape need to be recomputed?
-    bool _meshReady{ false };
+    bool _meshReady { false }; // do we have something to give scripts that ask for the mesh?
+    bool _voxelDataDirty { false }; // do we need to uncompress data and expand it into _volData?
+    bool _volDataDirty { false }; // does recomputeMesh need to be called?
+    bool _shapeReady { false }; // are we ready to tell bullet our shape?
+    PolyVoxState _state { PolyVoxState::Ready };
+    bool _updateNeeded { true };
+
     graphics::MeshPointer _mesh;
 
     ShapeInfo _shapeInfo;
 
     std::shared_ptr<PolyVox::SimpleVolume<uint8_t>> _volData;
-    bool _voxelDataDirty{ true };
-    bool _volDataDirty { false }; // does recomputeMesh need to be called?
     int _onCount; // how many non-zero voxels are in _volData
 
-    bool _neighborsNeedUpdate { false };
+    bool _neighborXNeedsUpdate { false };
+    bool _neighborYNeedsUpdate { false };
+    bool _neighborZNeedsUpdate { false };
+
+    bool _updateFromNeighborXEdge { false };
+    bool _updateFromNeighborYEdge { false };
+    bool _updateFromNeighborZEdge { false };
 
     // these are cached lookups of _xNNeighborID, _yNNeighborID, _zNNeighborID, _xPNeighborID, _yPNeighborID, _zPNeighborID
     EntityItemWeakPointer _xNNeighbor; // neighbor found by going along negative X axis
@@ -156,7 +194,6 @@ private:
     EntityItemWeakPointer _xPNeighbor; // neighbor found by going along positive X axis
     EntityItemWeakPointer _yPNeighbor;
     EntityItemWeakPointer _zPNeighbor;
-
 };
 
 namespace render { namespace entities {
@@ -170,7 +207,7 @@ public:
     virtual scriptable::ScriptableModelBase getScriptableModel() override {
         return asTypedEntity<RenderablePolyVoxEntityItem>()->getScriptableModel();
     }
-    
+
 protected:
     virtual ItemKey getKey() override { return ItemKey::Builder::opaqueShape().withTagBits(getTagMask()).withLayer(getHifiRenderLayer()); }
     virtual ShapeKey getShapeKey() override;
@@ -192,7 +229,6 @@ private:
     glm::mat4 _lastVoxelToWorldMatrix;
     PolyVoxEntityItem::PolyVoxSurfaceStyle _lastSurfaceStyle { PolyVoxEntityItem::SURFACE_MARCHING_CUBES };
     std::array<QString, 3> _xyzTextureUrls;
-    bool _neighborsNeedUpdate{ false };
 };
 
 } }
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index a1d24fe52e..b1feddfd47 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -24,6 +24,7 @@
 #include <ui/OffscreenQmlSurface.h>
 #include <ui/TabletScriptingInterface.h>
 #include <EntityScriptingInterface.h>
+#include <shared/LocalFileAccessGate.h>
 
 #include "EntitiesRendererLogging.h"
 #include <NetworkingConstants.h>
@@ -180,14 +181,23 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
         }
 
         // This work must be done on the main thread
+        bool localSafeContext = entity->getLocalSafeContext();
         if (!_webSurface) {
+            if (localSafeContext) {
+                ::hifi::scripting::setLocalAccessSafeThread(true);
+            }
             buildWebSurface(entity, newSourceURL);
+            ::hifi::scripting::setLocalAccessSafeThread(false);
         }
 
         if (_webSurface) {
             if (_webSurface->getRootItem()) {
                 if (_contentType == ContentType::HtmlContent && _sourceURL != newSourceURL) {
+                    if (localSafeContext) {
+                        ::hifi::scripting::setLocalAccessSafeThread(true);
+                    }
                     _webSurface->getRootItem()->setProperty(URL_PROPERTY, newSourceURL);
+                    ::hifi::scripting::setLocalAccessSafeThread(false);
                     _sourceURL = newSourceURL;
                 } else if (_contentType != ContentType::HtmlContent) {
                     _sourceURL = newSourceURL;
diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index a763c0f146..a222ca8216 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -14,6 +14,7 @@
 #include <QUrl>
 
 #include <ResourceManager.h>
+#include <shared/ScriptInitializerMixin.h>
 
 QList<EntityItemID> EntityEditFilters::getZonesByPosition(glm::vec3& position) {
     QList<EntityItemID> zones;
@@ -258,7 +259,13 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
         if (hasCorrectSyntax(program)) {
             // create a QScriptEngine for this script
             QScriptEngine* engine = new QScriptEngine();
-            engine->evaluate(scriptContents);
+            engine->setObjectName("filter:" + entityID.toString());
+            engine->setProperty("type", "edit_filter");
+            engine->setProperty("fileName", urlString);
+            engine->setProperty("entityID", entityID);
+            engine->globalObject().setProperty("Script", engine->newQObject(engine));
+            DependencyManager::get<ScriptInitializers>()->runScriptInitializers(engine);
+            engine->evaluate(scriptContents, urlString);
             if (!hadUncaughtExceptions(*engine, urlString)) {
                 // put the engine in the engine map (so we don't leak them, etc...)
                 FilterData filterData;
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 747d1e9a77..598ac17510 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -798,7 +798,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     auto lastEdited = lastEditedFromBufferAdjusted;
     bool otherOverwrites = overwriteLocalData && !weOwnSimulation;
     // calculate hasGrab once outside the lambda rather than calling it every time inside
-    bool hasGrab = stillHasGrabAction();
+    bool hasGrab = stillHasGrab();
     auto shouldUpdate = [lastEdited, otherOverwrites, filterRejection, hasGrab](quint64 updatedTimestamp, bool valueChanged) {
         if (hasGrab) {
             return false;
@@ -1075,16 +1075,13 @@ void EntityItem::setMass(float mass) {
 
 void EntityItem::setHref(QString value) {
     auto href = value.toLower();
-
-    // If the string has something and doesn't start with with "hifi://" it shouldn't be set
-    // We allow the string to be empty, because that's the initial state of this property
-    if (!value.isEmpty() &&
-        !(value.toLower().startsWith("hifi://")) &&
-        !(value.toLower().startsWith("file://"))
-        // TODO: serverless-domains will eventually support http and https also
-        ) {
-        return;
-    }
+    // Let's let the user set the value of this property to anything, then let consumers of the property
+    // decide what to do with it. Currently, the only in-engine consumers are `EntityTreeRenderer::mousePressEvent()`
+    // and `OtherAvatar::handleChangedAvatarEntityData()` (to remove the href property from others' avatar entities).
+    //
+    // We want this property to be as flexible as possible. The value of this property _should_ only be values that can
+    // be handled by `AddressManager::handleLookupString()`. That function will return `false` and not do
+    // anything if the value of this property isn't something that function can handle.
     withWriteLock([&] {
         _href = value;
     });
@@ -1444,7 +1441,7 @@ void EntityItem::getTransformAndVelocityProperties(EntityItemProperties& propert
 
 void EntityItem::upgradeScriptSimulationPriority(uint8_t priority) {
     uint8_t newPriority = glm::max(priority, _scriptSimulationPriority);
-    if (newPriority < SCRIPT_GRAB_SIMULATION_PRIORITY && stillHasMyGrabAction()) {
+    if (newPriority < SCRIPT_GRAB_SIMULATION_PRIORITY && stillHasMyGrab()) {
         newPriority = SCRIPT_GRAB_SIMULATION_PRIORITY;
     }
     if (newPriority != _scriptSimulationPriority) {
@@ -1457,7 +1454,7 @@ void EntityItem::upgradeScriptSimulationPriority(uint8_t priority) {
 void EntityItem::clearScriptSimulationPriority() {
     // DO NOT markDirtyFlags(Simulation::DIRTY_SIMULATION_OWNERSHIP_PRIORITY) here, because this
     // is only ever called from the code that actually handles the dirty flags, and it knows best.
-    _scriptSimulationPriority = stillHasMyGrabAction() ? SCRIPT_GRAB_SIMULATION_PRIORITY : 0;
+    _scriptSimulationPriority = stillHasMyGrab() ? SCRIPT_GRAB_SIMULATION_PRIORITY : 0;
 }
 
 void EntityItem::setPendingOwnershipPriority(uint8_t priority) {
@@ -2204,7 +2201,7 @@ void EntityItem::enableNoBootstrap() {
 }
 
 void EntityItem::disableNoBootstrap() {
-    if (!stillHasMyGrabAction()) {
+    if (!stillHasMyGrab()) {
         _flags &= ~Simulation::SPECIAL_FLAG_NO_BOOTSTRAPPING;
         _flags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
 
@@ -2290,33 +2287,25 @@ bool EntityItem::removeAction(EntitySimulationPointer simulation, const QUuid& a
     return success;
 }
 
-bool EntityItem::stillHasGrabAction() const {
-    return !_grabActions.empty();
+bool EntityItem::stillHasGrab() const {
+    return !(_grabs.empty());
 }
 
-// retutrns 'true' if there exists an action that returns 'true' for EntityActionInterface::isMine()
+// returns 'true' if there exists an action that returns 'true' for EntityActionInterface::isMine()
 // (e.g. the action belongs to the MyAvatar instance)
-bool EntityItem::stillHasMyGrabAction() const {
-    QList<EntityDynamicPointer> holdActions = getActionsOfType(DYNAMIC_TYPE_HOLD);
-    QList<EntityDynamicPointer>::const_iterator i = holdActions.begin();
-    while (i != holdActions.end()) {
-        EntityDynamicPointer action = *i;
-        if (action->isMine()) {
-            return true;
-        }
-        i++;
+bool EntityItem::stillHasMyGrab() const {
+    bool foundGrab = false;
+    if (!_grabs.empty()) {
+        _grabsLock.withReadLock([&] {
+            foreach (const GrabPointer &grab, _grabs) {
+                if (grab->getOwnerID() == Physics::getSessionUUID()) {
+                    foundGrab = true;
+                    break;
+                }
+            }
+        });
     }
-    QList<EntityDynamicPointer> farGrabActions = getActionsOfType(DYNAMIC_TYPE_FAR_GRAB);
-    i = farGrabActions.begin();
-    while (i != farGrabActions.end()) {
-        EntityDynamicPointer action = *i;
-        if (action->isMine()) {
-            return true;
-        }
-        i++;
-    }
-
-    return false;
+    return foundGrab;
 }
 
 bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPointer simulation) {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 5c7596f6dc..3274379ee9 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -569,7 +569,7 @@ public:
     static void setPrimaryViewFrustumPositionOperator(std::function<glm::vec3()> getPrimaryViewFrustumPositionOperator) { _getPrimaryViewFrustumPositionOperator = getPrimaryViewFrustumPositionOperator; }
     static glm::vec3 getPrimaryViewFrustumPosition() { return _getPrimaryViewFrustumPositionOperator(); }
 
-    bool stillHasMyGrabAction() const;
+    bool stillHasMyGrab() const;
 
     bool needsRenderUpdate() const { return resultWithReadLock<bool>([&] { return _needsRenderUpdate; }); }
     void setNeedsRenderUpdate(bool needsRenderUpdate) { withWriteLock([&] { _needsRenderUpdate = needsRenderUpdate; }); }
@@ -585,7 +585,7 @@ protected:
     void setSimulated(bool simulated) { _simulated = simulated; }
 
     const QByteArray getDynamicDataInternal() const;
-    bool stillHasGrabAction() const;
+    bool stillHasGrab() const;
     void setDynamicDataInternal(QByteArray dynamicData);
 
     virtual void dimensionsChanged() override;
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index c16839dc1a..5437ceaab8 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -965,7 +965,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  *             // Value overrides entity's "color" property.
  *             albedo: [1.0, 1.0, 0]  // Yellow
  *         }
- *     }),
+ *     })
  * });
  */
 
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 87f15896f2..7cfdc8a68d 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -481,11 +481,15 @@ QUuid EntityScriptingInterface::addEntityInternal(const EntityItemProperties& pr
     _activityTracking.addedEntityCount++;
 
     auto nodeList = DependencyManager::get<NodeList>();
-    const auto sessionID = nodeList->getSessionUUID();
+    auto sessionID = nodeList->getSessionUUID();
 
     EntityItemProperties propertiesWithSimID = properties;
     propertiesWithSimID.setEntityHostType(entityHostType);
     if (entityHostType == entity::HostType::AVATAR) {
+        if (sessionID.isNull()) {
+            // null sessionID is unacceptable in this case
+            sessionID = AVATAR_SELF_ID;
+        }
         propertiesWithSimID.setOwningAvatarID(sessionID);
     } else if (entityHostType == entity::HostType::LOCAL) {
         // For now, local entities are always collisionless
@@ -801,7 +805,7 @@ QUuid EntityScriptingInterface::editEntity(const QUuid& id, const EntityItemProp
             return;
         }
 
-        if (entity->isAvatarEntity() && entity->getOwningAvatarID() != sessionID) {
+        if (entity->isAvatarEntity() && entity->getOwningAvatarID() != sessionID && entity->getOwningAvatarID() != AVATAR_SELF_ID) {
             // don't edit other avatar's avatarEntities
             properties = EntityItemProperties();
             return;
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index ca9108852f..52470e56c4 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -1294,7 +1294,7 @@ public slots:
     Q_INVOKABLE int getJointParent(const QUuid& entityID, int index);
     
     /**jsdoc
-     * Gets the translation of a joint in a {@link Entities.EntityProperties-Model|Model} entity relative to the entity's 
+     * Gets the rotation of a joint in a {@link Entities.EntityProperties-Model|Model} entity relative to the entity's 
      * position and orientation.
      * @function Entities.getAbsoluteJointRotationInObjectFrame
      * @param {Uuid} entityID - The ID of the entity.
diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp
index b5e4fed0fd..9f81572a4a 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -242,11 +242,21 @@ void EntitySimulation::moveSimpleKinematics(uint64_t now) {
         entity->getMaximumAACube(ancestryIsKnown);
         bool hasAvatarAncestor = entity->hasAncestorOfType(NestableType::Avatar);
 
-        if (entity->isMovingRelativeToParent() && !entity->getPhysicsInfo() && ancestryIsKnown && !hasAvatarAncestor) {
+        bool isMoving = entity->isMovingRelativeToParent();
+        if (isMoving && !entity->getPhysicsInfo() && ancestryIsKnown && !hasAvatarAncestor) {
             entity->simulate(now);
+            if (ancestryIsKnown && !hasAvatarAncestor) {
+                entity->updateQueryAACube();
+            }
             _entitiesToSort.insert(entity);
             ++itemItr;
         } else {
+            if (!isMoving && ancestryIsKnown && !hasAvatarAncestor) {
+                // HACK: This catches most cases where the entity's QueryAACube (and spatial sorting in the EntityTree)
+                // would otherwise be out of date at conclusion of its "unowned" simpleKinematicMotion.
+                entity->updateQueryAACube();
+                _entitiesToSort.insert(entity);
+            }
             // the entity is no longer non-physical-kinematic
             itemItr = _simpleKinematicEntities.erase(itemItr);
         }
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index dca3ac595a..6c12c6d019 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2246,8 +2246,8 @@ void EntityTree::preUpdate() {
 void EntityTree::update(bool simulate) {
     PROFILE_RANGE(simulation_physics, "UpdateTree");
     PerformanceTimer perfTimer("updateTree");
-    withWriteLock([&] {
-        if (simulate && _simulation) {
+    if (simulate && _simulation) {
+        withWriteLock([&] {
             _simulation->updateEntities();
             {
                 PROFILE_RANGE(simulation_physics, "Deletes");
@@ -2265,8 +2265,8 @@ void EntityTree::update(bool simulate) {
                     deleteEntities(idsToDelete, true);
                 }
             }
-        }
-    });
+        });
+    }
 }
 
 quint64 EntityTree::getAdjustedConsiderSince(quint64 sinceTime) {
diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp
index 186a8fa8b4..a62f599e4c 100644
--- a/libraries/entities/src/WebEntityItem.cpp
+++ b/libraries/entities/src/WebEntityItem.cpp
@@ -15,6 +15,7 @@
 
 #include <ByteCountCoding.h>
 #include <GeometryUtil.h>
+#include <shared/LocalFileAccessGate.h>
 
 #include "EntitiesLogging.h"
 #include "EntityItemProperties.h"
@@ -31,6 +32,9 @@ EntityItemPointer WebEntityItem::factory(const EntityItemID& entityID, const Ent
 }
 
 WebEntityItem::WebEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
+    // this initialzation of localSafeContext is reading a thread-local variable and that is depends on
+    // the ctor being executed on the same thread as the script, assuming it's being create by a script
+    _localSafeContext = hifi::scripting::isLocalAccessSafeThread();
     _type = EntityTypes::Web;
 }
 
@@ -241,6 +245,12 @@ glm::u8vec3 WebEntityItem::getColor() const {
     });
 }
 
+bool WebEntityItem::getLocalSafeContext() const {
+    return resultWithReadLock<bool>([&] {
+        return _localSafeContext;
+    });
+}
+
 void WebEntityItem::setAlpha(float alpha) {
     withWriteLock([&] {
         _needsRenderUpdate |= _alpha != alpha;
diff --git a/libraries/entities/src/WebEntityItem.h b/libraries/entities/src/WebEntityItem.h
index bb1e527712..b61e2b124f 100644
--- a/libraries/entities/src/WebEntityItem.h
+++ b/libraries/entities/src/WebEntityItem.h
@@ -74,6 +74,8 @@ public:
     void setScriptURL(const QString& value);
     QString getScriptURL() const;
 
+    bool getLocalSafeContext() const;
+
     static const uint8_t DEFAULT_MAX_FPS;
     void setMaxFPS(uint8_t value);
     uint8_t getMaxFPS() const;
@@ -98,6 +100,7 @@ protected:
     uint8_t _maxFPS;
     WebInputMode _inputMode;
     bool _showKeyboardFocusHighlight;
+    bool _localSafeContext { false };
 };
 
 #endif // hifi_WebEntityItem_h
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackendQuery.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackendQuery.cpp
index 7f61ca78f6..1cff06d919 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackendQuery.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackendQuery.cpp
@@ -21,8 +21,10 @@ const uint32_t MAX_RANGE_QUERY_DEPTH = 1;
 static bool timeElapsed = true;
 #else
 const uint32_t MAX_RANGE_QUERY_DEPTH = 10000;
+#if !defined(USE_GLES)
 static bool timeElapsed = false;
 #endif
+#endif
 
 #if defined(USE_GLES)
 static bool hasTimerExtension() {
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
index 36b37083cb..99bcb34547 100644
--- a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
@@ -17,34 +17,6 @@
 
 namespace gpu { namespace gles { 
 
-
-// returns the FOV from the projection matrix
-static inline vec4 extractFov( const glm::mat4& m) {
-    static const std::array<vec4, 4> CLIPS{ {
-                                                { 1, 0, 0, 1 },
-                                                { -1, 0, 0, 1 },
-                                                { 0, 1, 0, 1 },
-                                                { 0, -1, 0, 1 }
-                                            } };
-
-    glm::mat4 mt = glm::transpose(m);
-    vec4 v, result;
-    // Left
-    v = mt * CLIPS[0];
-    result.x = -atanf(v.z / v.x);
-    // Right
-    v = mt * CLIPS[1];
-    result.y = atanf(v.z / v.x);
-    // Down
-    v = mt * CLIPS[2];
-    result.z = -atanf(v.z / v.y);
-    // Up
-    v = mt * CLIPS[3];
-    result.w = atanf(v.z / v.y);
-    return result;
-}
-
-
 class GLESFramebuffer : public gl::GLFramebuffer {
     using Parent = gl::GLFramebuffer;
     static GLuint allocate() {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 428c08e9f6..1295fc5722 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -50,6 +50,8 @@ namespace scriptable {
      * @property {string} emissiveMap
      * @property {string} albedoMap
      * @property {string} opacityMap
+     * @property {string} opacityMapMode
+     * @property {number|string} opacityCutoff
      * @property {string} metallicMap
      * @property {string} specularMap
      * @property {string} roughnessMap
@@ -84,6 +86,8 @@ namespace scriptable {
         QString emissiveMap;
         QString albedoMap;
         QString opacityMap;
+        QString opacityMapMode;
+        float opacityCutoff;
         QString metallicMap;
         QString specularMap;
         QString roughnessMap;
@@ -94,7 +98,6 @@ namespace scriptable {
         QString lightMap;
         QString scatteringMap;
         std::array<glm::mat4, graphics::Material::NUM_TEXCOORD_TRANSFORMS> texCoordTransforms;
-
         bool defaultFallthrough;
         std::unordered_map<uint, bool> propertyFallthroughs; // not actually exposed to script
 
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 45f8461a1a..ca9634e365 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -420,6 +420,18 @@ namespace scriptable {
             obj.setProperty("opacityMap", material.opacityMap);
         }
 
+        if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::OPACITY_TRANSLUCENT_MAP_BIT | graphics::MaterialKey::OPACITY_MASK_MAP_BIT)) {
+            obj.setProperty("opacityMapMode", FALLTHROUGH);
+        } else if (material.key.getOpacityMapMode() != graphics::Material::DEFAULT_OPACITY_MAP_MODE) {
+            obj.setProperty("opacityMapMode", material.opacityMapMode);
+        }
+
+        if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::OPACITY_CUTOFF_VAL_BIT)) {
+            obj.setProperty("opacityCutoff", FALLTHROUGH);
+        } else if (material.key.isOpacityCutoff()) {
+            obj.setProperty("opacityCutoff", material.opacityCutoff);
+        }
+
         if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::OCCLUSION_MAP_BIT)) {
             obj.setProperty("occlusionMap", FALLTHROUGH);
         } else if (!material.occlusionMap.isEmpty()) {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index e9cc7930ae..bc610108ec 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -26,6 +26,7 @@ scriptable::ScriptableMaterial& scriptable::ScriptableMaterial::operator=(const
     roughness = material.roughness;
     metallic = material.metallic;
     scattering = material.scattering;
+    opacityCutoff = material.opacityCutoff;
     unlit = material.unlit;
     emissive = material.emissive;
     albedo = material.albedo;
@@ -41,6 +42,8 @@ scriptable::ScriptableMaterial& scriptable::ScriptableMaterial::operator=(const
     occlusionMap = material.occlusionMap;
     lightMap = material.lightMap;
     scatteringMap = material.scatteringMap;
+    opacityMapMode = material.opacityMapMode;
+
 
     defaultFallthrough = material.defaultFallthrough;
     propertyFallthroughs = material.propertyFallthroughs;
@@ -55,9 +58,12 @@ scriptable::ScriptableMaterial::ScriptableMaterial(const graphics::MaterialPoint
         name = material->getName().c_str();
         model = material->getModel().c_str();
         opacity = material->getOpacity();
+
+        opacityMapMode = QString(graphics::MaterialKey::getOpacityMapModeName(material->getOpacityMapMode()).c_str());
         roughness = material->getRoughness();
         metallic = material->getMetallic();
         scattering = material->getScattering();
+        opacityCutoff = material->getOpacityCutoff();
         unlit = material->isUnlit();
         emissive = material->getEmissive();
         albedo = material->getAlbedo();
diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp
index 6be8ec5f68..dffc52e29f 100755
--- a/libraries/graphics/src/graphics/Material.cpp
+++ b/libraries/graphics/src/graphics/Material.cpp
@@ -14,6 +14,8 @@
 
 #include <Transform.h>
 
+#include "GraphicsLogging.h"
+
 using namespace graphics;
 using namespace gpu;
 
@@ -22,7 +24,26 @@ const float Material::DEFAULT_OPACITY { 1.0f };
 const float Material::DEFAULT_ALBEDO { 0.5f };
 const float Material::DEFAULT_METALLIC { 0.0f };
 const float Material::DEFAULT_ROUGHNESS { 1.0f };
-const float Material::DEFAULT_SCATTERING { 0.0f };
+const float Material::DEFAULT_SCATTERING{ 0.0f };
+const MaterialKey::OpacityMapMode Material::DEFAULT_OPACITY_MAP_MODE{ MaterialKey::OPACITY_MAP_OPAQUE };
+const float Material::DEFAULT_OPACITY_CUTOFF { 0.5f };
+
+
+std::string MaterialKey::getOpacityMapModeName(OpacityMapMode mode) {
+    const std::string names[3] = { "OPACITY_MAP_OPAQUE", "OPACITY_MAP_MASK", "OPACITY_MAP_BLEND" };
+    return names[mode];
+}
+
+
+bool MaterialKey::getOpacityMapModeFromName(const std::string& modeName, MaterialKey::OpacityMapMode& mode) {
+    for (int i = OPACITY_MAP_OPAQUE; i <= OPACITY_MAP_BLEND; i++) {
+        mode = (MaterialKey::OpacityMapMode) i;
+        if (modeName == getOpacityMapModeName(mode)) {
+            return true;
+        }
+    }
+    return false;
+}
 
 Material::Material() {
     for (int i = 0; i < NUM_TOTAL_FLAGS; i++) {
@@ -40,6 +61,7 @@ Material::Material(const Material& material) :
     _roughness(material._roughness),
     _metallic(material._metallic),
     _scattering(material._scattering),
+    _opacityCutoff(material._opacityCutoff),
     _texcoordTransforms(material._texcoordTransforms),
     _lightmapParams(material._lightmapParams),
     _materialParams(material._materialParams),
@@ -50,7 +72,7 @@ Material::Material(const Material& material) :
 }
 
 Material& Material::operator=(const Material& material) {
-    QMutexLocker locker(&_textureMapsMutex);
+    std::lock_guard<std::recursive_mutex> locker(_textureMapsMutex);
 
     _name = material._name;
     _model = material._model;
@@ -61,6 +83,7 @@ Material& Material::operator=(const Material& material) {
     _roughness = material._roughness;
     _metallic = material._metallic;
     _scattering = material._scattering;
+    _opacityCutoff = material._opacityCutoff;
     _texcoordTransforms = material._texcoordTransforms;
     _lightmapParams = material._lightmapParams;
     _materialParams = material._materialParams;
@@ -109,8 +132,22 @@ void Material::setScattering(float scattering) {
     _scattering = scattering;
 }
 
+void Material::setOpacityCutoff(float opacityCutoff) {
+    opacityCutoff = glm::clamp(opacityCutoff, 0.0f, 1.0f);
+    _key.setOpacityCutoff(opacityCutoff != DEFAULT_OPACITY_CUTOFF);
+    _opacityCutoff = opacityCutoff;
+}
+
+void Material::setOpacityMapMode(MaterialKey::OpacityMapMode opacityMapMode) {
+    _key.setOpacityMapMode(opacityMapMode);
+}
+
+MaterialKey::OpacityMapMode  Material::getOpacityMapMode() const {
+    return _key.getOpacityMapMode();
+}
+
 void Material::setTextureMap(MapChannel channel, const TextureMapPointer& textureMap) {
-    QMutexLocker locker(&_textureMapsMutex);
+    std::lock_guard<std::recursive_mutex>  locker(_textureMapsMutex);
 
     if (textureMap) {
         _key.setMapChannel(channel, true);
@@ -139,7 +176,14 @@ void Material::setTextureMap(MapChannel channel, const TextureMapPointer& textur
 
 }
 
-void Material::resetOpacityMap() const {
+bool Material::resetOpacityMap() const {
+    // If OpacityMapMode explicit then nothing need to change here.
+    if (_key.isOpacityMapMode()) {
+        return false;
+    }
+
+    // Else, the legacy behavior is to interpret the albedo texture assigned to tune the opacity map mode value
+    auto previous = _key.getOpacityMapMode();
     // Clear the previous flags
     _key.setOpacityMaskMap(false);
     _key.setTranslucentMap(false);
@@ -163,10 +207,16 @@ void Material::resetOpacityMap() const {
             }
         }
     }
+    auto newious = _key.getOpacityMapMode();
+    if (previous != newious) {
+        //opacity change detected for this material
+        return true;
+    }
+    return false;
 }
 
 const TextureMapPointer Material::getTextureMap(MapChannel channel) const {
-    QMutexLocker locker(&_textureMapsMutex);
+    std::lock_guard<std::recursive_mutex> locker(_textureMapsMutex);
 
     auto result = _textureMaps.find(channel);
     if (result != _textureMaps.end()) {
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index 25601c5743..25ff711c0c 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -11,8 +11,7 @@
 #ifndef hifi_model_Material_h
 #define hifi_model_Material_h
 
-#include <QMutex>
-
+#include <mutex>
 #include <bitset>
 #include <map>
 #include <unordered_map>
@@ -44,6 +43,8 @@ public:
         OPACITY_VAL_BIT,
         OPACITY_MASK_MAP_BIT,           // Opacity Map and Opacity MASK map are mutually exclusive
         OPACITY_TRANSLUCENT_MAP_BIT,
+        OPACITY_MAP_MODE_BIT,           // Opacity map mode bit is set if the value has set explicitely and not deduced from the textures assigned 
+        OPACITY_CUTOFF_VAL_BIT,
         SCATTERING_VAL_BIT,
 
         // THe map bits must be in the same sequence as the enum names for the map channels
@@ -73,6 +74,15 @@ public:
         NUM_MAP_CHANNELS,
     };
 
+    enum OpacityMapMode {
+        OPACITY_MAP_OPAQUE = 0,
+        OPACITY_MAP_MASK,
+        OPACITY_MAP_BLEND,
+    };
+    static std::string getOpacityMapModeName(OpacityMapMode mode);
+    // find the enum value from a string, return true if match found
+    static bool getOpacityMapModeFromName(const std::string& modeName, OpacityMapMode& mode);
+
     // The signature is the Flags
     Flags _flags;
 
@@ -94,6 +104,27 @@ public:
         Builder& withGlossy() { _flags.set(GLOSSY_VAL_BIT); return (*this); }
 
         Builder& withTranslucentFactor() { _flags.set(OPACITY_VAL_BIT); return (*this); }
+        Builder& withTranslucentMap() { _flags.set(OPACITY_TRANSLUCENT_MAP_BIT); return (*this); }
+        Builder& withMaskMap() { _flags.set(OPACITY_MASK_MAP_BIT); return (*this); }
+        Builder& withOpacityMapMode(OpacityMapMode mode) {
+            switch (mode) {
+            case OPACITY_MAP_OPAQUE:
+                _flags.reset(OPACITY_TRANSLUCENT_MAP_BIT);
+                _flags.reset(OPACITY_MASK_MAP_BIT);
+                break;
+            case OPACITY_MAP_MASK:
+                _flags.reset(OPACITY_TRANSLUCENT_MAP_BIT);
+                _flags.set(OPACITY_MASK_MAP_BIT);
+                break;
+            case OPACITY_MAP_BLEND:
+                _flags.set(OPACITY_TRANSLUCENT_MAP_BIT);
+                _flags.reset(OPACITY_MASK_MAP_BIT);
+                break;
+            };
+            _flags.set(OPACITY_MAP_MODE_BIT); // Intentionally set the mode!
+            return (*this);
+        }
+        Builder& withOpacityCutoff() { _flags.set(OPACITY_CUTOFF_VAL_BIT); return (*this); }
 
         Builder& withScattering() { _flags.set(SCATTERING_VAL_BIT); return (*this); }
 
@@ -102,9 +133,6 @@ public:
         Builder& withMetallicMap() { _flags.set(METALLIC_MAP_BIT); return (*this); }
         Builder& withRoughnessMap() { _flags.set(ROUGHNESS_MAP_BIT); return (*this); }
 
-        Builder& withTranslucentMap() { _flags.set(OPACITY_TRANSLUCENT_MAP_BIT); return (*this); }
-        Builder& withMaskMap() { _flags.set(OPACITY_MASK_MAP_BIT); return (*this); }
-
         Builder& withNormalMap() { _flags.set(NORMAL_MAP_BIT); return (*this); }
         Builder& withOcclusionMap() { _flags.set(OCCLUSION_MAP_BIT); return (*this); }
         Builder& withLightMap() { _flags.set(LIGHT_MAP_BIT); return (*this); }
@@ -151,6 +179,9 @@ public:
     void setOpacityMaskMap(bool value) { _flags.set(OPACITY_MASK_MAP_BIT, value); }
     bool isOpacityMaskMap() const { return _flags[OPACITY_MASK_MAP_BIT]; }
 
+    void setOpacityCutoff(bool value) { _flags.set(OPACITY_CUTOFF_VAL_BIT, value); }
+    bool isOpacityCutoff() const { return _flags[OPACITY_CUTOFF_VAL_BIT]; }
+
     void setNormalMap(bool value) { _flags.set(NORMAL_MAP_BIT, value); }
     bool isNormalMap() const { return _flags[NORMAL_MAP_BIT]; }
 
@@ -171,6 +202,26 @@ public:
 
 
     // Translucency and Opacity Heuristics are combining several flags:
+    void setOpacityMapMode(OpacityMapMode mode) {
+        switch (mode) {
+        case OPACITY_MAP_OPAQUE:
+            _flags.reset(OPACITY_TRANSLUCENT_MAP_BIT);
+            _flags.reset(OPACITY_MASK_MAP_BIT);
+            break;
+        case OPACITY_MAP_MASK:
+            _flags.reset(OPACITY_TRANSLUCENT_MAP_BIT);
+            _flags.set(OPACITY_MASK_MAP_BIT);
+            break;
+        case OPACITY_MAP_BLEND:
+            _flags.set(OPACITY_TRANSLUCENT_MAP_BIT);
+            _flags.reset(OPACITY_MASK_MAP_BIT);
+            break;
+        };
+        _flags.set(OPACITY_MAP_MODE_BIT); // Intentionally set the mode!
+    }
+    bool isOpacityMapMode() const { return _flags[OPACITY_MAP_MODE_BIT]; }
+    OpacityMapMode getOpacityMapMode() const { return (isOpacityMaskMap() ? OPACITY_MAP_MASK : (isTranslucentMap() ? OPACITY_MAP_BLEND : OPACITY_MAP_OPAQUE)); }
+
     bool isTranslucent() const { return isTranslucentFactor() || isTranslucentMap(); }
     bool isOpaque() const { return !isTranslucent(); }
     bool isSurfaceOpaque() const { return isOpaque() && !isOpacityMaskMap(); }
@@ -229,6 +280,12 @@ public:
         Builder& withoutMaskMap()       { _value.reset(MaterialKey::OPACITY_MASK_MAP_BIT); _mask.set(MaterialKey::OPACITY_MASK_MAP_BIT); return (*this); }
         Builder& withMaskMap()        { _value.set(MaterialKey::OPACITY_MASK_MAP_BIT);  _mask.set(MaterialKey::OPACITY_MASK_MAP_BIT); return (*this); }
 
+        Builder& withoutOpacityMapMode() { _value.reset(MaterialKey::OPACITY_MAP_MODE_BIT); _mask.set(MaterialKey::OPACITY_MAP_MODE_BIT); return (*this); }
+        Builder& withOpacityMapMode() { _value.set(MaterialKey::OPACITY_MAP_MODE_BIT);  _mask.set(MaterialKey::OPACITY_MAP_MODE_BIT); return (*this); }
+
+        Builder& withoutOpacityCutoff() { _value.reset(MaterialKey::OPACITY_CUTOFF_VAL_BIT); _mask.set(MaterialKey::OPACITY_CUTOFF_VAL_BIT); return (*this); }
+        Builder& withOpacityCutoff() { _value.set(MaterialKey::OPACITY_CUTOFF_VAL_BIT);  _mask.set(MaterialKey::OPACITY_CUTOFF_VAL_BIT); return (*this); }
+
         Builder& withoutNormalMap()       { _value.reset(MaterialKey::NORMAL_MAP_BIT); _mask.set(MaterialKey::NORMAL_MAP_BIT); return (*this); }
         Builder& withNormalMap()        { _value.set(MaterialKey::NORMAL_MAP_BIT);  _mask.set(MaterialKey::NORMAL_MAP_BIT); return (*this); }
 
@@ -283,6 +340,14 @@ public:
     void setOpacity(float opacity);
     float getOpacity() const { return _opacity; }
 
+    static const MaterialKey::OpacityMapMode DEFAULT_OPACITY_MAP_MODE;
+    void setOpacityMapMode(MaterialKey::OpacityMapMode opacityMapMode);
+    MaterialKey::OpacityMapMode getOpacityMapMode() const;
+
+    static const float DEFAULT_OPACITY_CUTOFF;
+    void setOpacityCutoff(float opacityCutoff);
+    float getOpacityCutoff() const { return _opacityCutoff; }
+
     void setUnlit(bool value);
     bool isUnlit() const { return _key.isUnlit(); }
 
@@ -310,7 +375,8 @@ public:
 
     // Albedo maps cannot have opacity detected until they are loaded
     // This method allows const changing of the key/schemaBuffer without touching the map
-    void resetOpacityMap() const;
+    // return true if the opacity changed, flase otherwise
+    bool resetOpacityMap() const;
 
     // conversion from legacy material properties to PBR equivalent
     static float shininessToRoughness(float shininess) { return 1.0f - shininess / 100.0f; }
@@ -357,6 +423,7 @@ private:
     float _roughness { DEFAULT_ROUGHNESS };
     float _metallic { DEFAULT_METALLIC };
     float _scattering { DEFAULT_SCATTERING };
+    float _opacityCutoff { DEFAULT_OPACITY_CUTOFF };
     std::array<glm::mat4, NUM_TEXCOORD_TRANSFORMS> _texcoordTransforms;
     glm::vec2 _lightmapParams { 0.0, 1.0 };
     glm::vec2 _materialParams { 0.0, 1.0 };
@@ -365,7 +432,7 @@ private:
     bool _defaultFallthrough { false };
     std::unordered_map<uint, bool> _propertyFallthroughs { NUM_TOTAL_FLAGS };
 
-    mutable QMutex _textureMapsMutex { QMutex::Recursive };
+    mutable std::recursive_mutex _textureMapsMutex;
 };
 typedef std::shared_ptr<Material> MaterialPointer;
 
@@ -425,18 +492,8 @@ public:
 
         float _metallic { Material::DEFAULT_METALLIC }; // Not Metallic
         float _scattering { Material::DEFAULT_SCATTERING }; // Scattering info
-#if defined(__clang__)
-        __attribute__((unused))
-#endif
-        glm::vec2 _spare { 0.0f }; // Padding
-
+        float _opacityCutoff { Material::DEFAULT_OPACITY_CUTOFF }; // Opacity cutoff applyed when using opacityMap as Mask 
         uint32_t _key { 0 }; // a copy of the materialKey
-#if defined(__clang__)
-        __attribute__((unused))
-#endif
-        glm::vec3 _spare2 { 0.0f };
-
-        // for alignment beauty, Material size == Mat4x4
 
         // Texture Coord Transform Array
         glm::mat4 _texcoordTransforms[Material::NUM_TEXCOORD_TRANSFORMS];
diff --git a/libraries/graphics/src/graphics/Material.slh b/libraries/graphics/src/graphics/Material.slh
index dfd4a8eec4..328ff4a3af 100644
--- a/libraries/graphics/src/graphics/Material.slh
+++ b/libraries/graphics/src/graphics/Material.slh
@@ -49,8 +49,7 @@ struct TexMapArray {
 struct Material {
     vec4 _emissiveOpacity;
     vec4 _albedoRoughness;
-    vec4 _metallicScatteringSpare2;
-    vec4 _keySpare3;
+    vec4 _metallicScatteringOpacityCutoffKey;
 };
 
 LAYOUT_STD140(binding=GRAPHICS_BUFFER_MATERIAL) uniform materialBuffer {
@@ -72,10 +71,11 @@ vec3 getMaterialAlbedo(Material m) { return m._albedoRoughness.rgb; }
 float getMaterialRoughness(Material m) { return m._albedoRoughness.a; }
 float getMaterialShininess(Material m) { return 1.0 - getMaterialRoughness(m); }
 
-float getMaterialMetallic(Material m) { return m._metallicScatteringSpare2.x; }
-float getMaterialScattering(Material m) { return m._metallicScatteringSpare2.y; }
+float getMaterialMetallic(Material m) { return m._metallicScatteringOpacityCutoffKey.x; }
+float getMaterialScattering(Material m) { return m._metallicScatteringOpacityCutoffKey.y; }
+float getMaterialOpacityCutoff(Material m) { return m._metallicScatteringOpacityCutoffKey.z; }
 
-BITFIELD getMaterialKey(Material m) { return floatBitsToInt(m._keySpare3.x); }
+BITFIELD getMaterialKey(Material m) { return floatBitsToInt(m._metallicScatteringOpacityCutoffKey.w); }
 
 const BITFIELD EMISSIVE_VAL_BIT              = 0x00000001;
 const BITFIELD UNLIT_VAL_BIT                 = 0x00000002;
@@ -85,16 +85,18 @@ const BITFIELD GLOSSY_VAL_BIT                = 0x00000010;
 const BITFIELD OPACITY_VAL_BIT               = 0x00000020;
 const BITFIELD OPACITY_MASK_MAP_BIT          = 0x00000040;
 const BITFIELD OPACITY_TRANSLUCENT_MAP_BIT   = 0x00000080;
-const BITFIELD SCATTERING_VAL_BIT            = 0x00000100;
+const BITFIELD OPACITY_MAP_MODE_BIT          = 0x00000100;
+const BITFIELD OPACITY_CUTOFF_VAL_BIT        = 0x00000200;
+const BITFIELD SCATTERING_VAL_BIT            = 0x00000400;
 
 
-const BITFIELD EMISSIVE_MAP_BIT              = 0x00000200;
-const BITFIELD ALBEDO_MAP_BIT                = 0x00000400;
-const BITFIELD METALLIC_MAP_BIT              = 0x00000800;
-const BITFIELD ROUGHNESS_MAP_BIT             = 0x00001000;
-const BITFIELD NORMAL_MAP_BIT                = 0x00002000;
-const BITFIELD OCCLUSION_MAP_BIT             = 0x00004000;
-const BITFIELD LIGHTMAP_MAP_BIT              = 0x00008000;
-const BITFIELD SCATTERING_MAP_BIT            = 0x00010000;
+const BITFIELD EMISSIVE_MAP_BIT              = 0x00000800;
+const BITFIELD ALBEDO_MAP_BIT                = 0x00001000;
+const BITFIELD METALLIC_MAP_BIT              = 0x00002000;
+const BITFIELD ROUGHNESS_MAP_BIT             = 0x00004000;
+const BITFIELD NORMAL_MAP_BIT                = 0x00008000;
+const BITFIELD OCCLUSION_MAP_BIT             = 0x00010000;
+const BITFIELD LIGHTMAP_MAP_BIT              = 0x00020000;
+const BITFIELD SCATTERING_MAP_BIT            = 0x00040000;
 
 <@endif@>
diff --git a/libraries/graphics/src/graphics/MaterialTextures.slh b/libraries/graphics/src/graphics/MaterialTextures.slh
index bf0416c7bf..2a291e5d57 100644
--- a/libraries/graphics/src/graphics/MaterialTextures.slh
+++ b/libraries/graphics/src/graphics/MaterialTextures.slh
@@ -111,7 +111,7 @@ vec3 fetchNormalMap(vec2 uv) {
     // unpack normal, swizzle to get into hifi tangent space with Y axis pointing out
     vec2 t = 2.0 * (texture(normalMap, uv, TAA_TEXTURE_LOD_BIAS).rg - vec2(0.5, 0.5));
     vec2 t2 = t*t;
-    return vec3(t.x, sqrt(1.0 - t2.x - t2.y), t.y);
+    return vec3(t.x, sqrt(max(0.0, 1.0 - t2.x - t2.y)), t.y);
 }
 <@endif@>
 
@@ -214,14 +214,22 @@ vec3 fetchLightMap(vec2 uv) {
 }
 <@endfunc@>
 
-<@func evalMaterialOpacity(fetchedOpacity, materialOpacity, matKey, opacity)@>
+<@func evalMaterialOpacityMask(fetchedOpacity, materialOpacityCutoff, opacity)@>
 {
-    const float OPACITY_MASK_THRESHOLD = 0.5;
-    <$opacity$> = mix(1.0,
-                      mix(<$fetchedOpacity$>,
-                          step(OPACITY_MASK_THRESHOLD, <$fetchedOpacity$>),
-                          float((<$matKey$> & OPACITY_MASK_MAP_BIT) != 0)),
-                      float((<$matKey$> & (OPACITY_TRANSLUCENT_MAP_BIT | OPACITY_MASK_MAP_BIT)) != 0)) * <$materialOpacity$>;
+    // This path only valid for opaque or texel opaque material 
+    <$opacity$> = step(<$materialOpacityCutoff$>, <$fetchedOpacity$>);
+}
+<@endfunc@>
+
+
+<@func evalMaterialOpacity(fetchedOpacity, materialOpacityCutoff, materialOpacity, matKey, opacity)@>
+{
+    // This path only valid for transparent material
+    // Assert that float((<$matKey$> & (OPACITY_TRANSLUCENT_MAP_BIT | OPACITY_MASK_MAP_BIT)) != 0)) == 1.0
+    <$opacity$> = mix(<$fetchedOpacity$>,
+                          step(<$materialOpacityCutoff$>, <$fetchedOpacity$>),
+                          float((<$matKey$> & OPACITY_MASK_MAP_BIT) != 0))
+                       * <$materialOpacity$>;
 }
 <@endfunc@>
 
diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index 484a10aa3b..888e562bca 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -56,7 +56,7 @@ const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
 
 using ShapeVertices = std::vector<glm::vec3>;
 // The version of the Draco mesh binary data itself. See also: FBX_DRACO_MESH_VERSION in FBX.h
-static const int DRACO_MESH_VERSION = 2;
+static const int DRACO_MESH_VERSION = 3;
 
 static const int DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES = 1000;
 static const int DRACO_ATTRIBUTE_MATERIAL_ID = DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES;
diff --git a/libraries/material-networking/src/material-networking/MaterialCache.cpp b/libraries/material-networking/src/material-networking/MaterialCache.cpp
index 087e1ca049..db4783d249 100644
--- a/libraries/material-networking/src/material-networking/MaterialCache.cpp
+++ b/libraries/material-networking/src/material-networking/MaterialCache.cpp
@@ -139,6 +139,14 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater
  * @property {string} opacityMap - The URL of the opacity texture image. Set the value the same as the <code>albedoMap</code> 
  *     value for transparency. 
  *     <code>"hifi_pbr"</code> model only.
+ * @property {number|string} opacityMapMode - The mode defining the interpretation of the opacity map. Values can be:
+ *     <code>"OPACITY_MAP_OPAQUE"</code> for ignoring the opacity map information.
+ *     <code>"OPACITY_MAP_MASK"</code> for using the opacity map as a mask, where only the texel greater than opacityCutoff are visible and rendered opaque.
+ *     <code>"OPACITY_MAP_BLEND"</code> for using the opacity map for alpha blending the material surface with the background.
+ *     Set to <code>"fallthrough"</code> to fall through to the material below. <code>"hifi_pbr"</code> model only.
+ * @property {number|string} opacityCutoff - The opacity cutoff threshold used to determine the opaque texels of the Opacity map
+ *     when opacityMapMode is "OPACITY_MAP_MASK", range <code>0.0</code> &ndash; <code>1.0</code>.
+ *     Set to <code>"fallthrough"</code> to fall through to the material below. <code>"hifi_pbr"</code> model only.
  * @property {string} roughnessMap - The URL of the roughness texture image. You can use this or <code>glossMap</code>, but not 
  *     both. 
  *     Set to <code>"fallthrough"</code> to fall through to the material below. <code>"hifi_pbr"</code> model only.
@@ -258,6 +266,24 @@ std::pair<std::string, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource
                 } else if (value.isDouble()) {
                     material->setMetallic(value.toDouble());
                 }
+           } else if (key == "opacityMapMode") {
+                auto value = materialJSON.value(key);
+                auto valueString = (value.isString() ? value.toString() : "");
+                if (valueString == FALLTHROUGH) {
+                    material->setPropertyDoesFallthrough(graphics::MaterialKey::FlagBit::OPACITY_MAP_MODE_BIT);
+                } else {
+                    graphics::MaterialKey::OpacityMapMode mode;
+                    if (graphics::MaterialKey::getOpacityMapModeFromName(valueString.toStdString(), mode)) {
+                        material->setOpacityMapMode(mode);
+                    }
+                }
+           } else if (key == "opacityCutoff") {
+                auto value = materialJSON.value(key);
+                if (value.isString() && value.toString() == FALLTHROUGH) {
+                    material->setPropertyDoesFallthrough(graphics::MaterialKey::FlagBit::OPACITY_CUTOFF_VAL_BIT);
+                } else if (value.isDouble()) {
+                    material->setOpacityCutoff(value.toDouble());
+                }
             } else if (key == "scattering") {
                 auto value = materialJSON.value(key);
                 if (value.isString() && value.toString() == FALLTHROUGH) {
@@ -748,13 +774,14 @@ bool NetworkMaterial::isMissingTexture() {
     return false;
 }
 
-void NetworkMaterial::checkResetOpacityMap() {
+bool NetworkMaterial::checkResetOpacityMap() {
     // If material textures are loaded, check the material translucency
     // FIXME: This should not be done here.  The opacity map should already be reset in Material::setTextureMap.
     // However, currently that code can be called before the albedo map is defined, so resetOpacityMap will fail.
     // Geometry::areTexturesLoaded() is called repeatedly until it returns true, so we do the check here for now
     const auto& albedoTexture = _textures[NetworkMaterial::MapChannel::ALBEDO_MAP];
     if (albedoTexture.texture) {
-        resetOpacityMap();
+        return resetOpacityMap();
     }
+    return false;
 }
diff --git a/libraries/material-networking/src/material-networking/MaterialCache.h b/libraries/material-networking/src/material-networking/MaterialCache.h
index 18aa5e5994..aa103adb1e 100644
--- a/libraries/material-networking/src/material-networking/MaterialCache.h
+++ b/libraries/material-networking/src/material-networking/MaterialCache.h
@@ -34,7 +34,7 @@ public:
     void setLightMap(const QUrl& url);
 
     bool isMissingTexture();
-    void checkResetOpacityMap();
+    bool checkResetOpacityMap();
 
     class Texture {
     public:
diff --git a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp b/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp
new file mode 100644
index 0000000000..193d9b96ee
--- /dev/null
+++ b/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.cpp
@@ -0,0 +1,17 @@
+//
+//  MaterialCacheScriptingInterface.cpp
+//  libraries/mmodel-networking/src/model-networking
+//
+//  Created by Sam Gateau on 17 September 2019.
+//  Copyright 2019 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 "MaterialCacheScriptingInterface.h"
+
+MaterialCacheScriptingInterface::MaterialCacheScriptingInterface() :
+    ScriptableResourceCache::ScriptableResourceCache(DependencyManager::get<MaterialCache>())
+{ }
+
diff --git a/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h b/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h
new file mode 100644
index 0000000000..c619966a2a
--- /dev/null
+++ b/libraries/material-networking/src/material-networking/MaterialCacheScriptingInterface.h
@@ -0,0 +1,51 @@
+//
+//  MaterialCacheScriptingInterface.h
+//  libraries/material-networking/src/material-networking
+//
+//  Created by Sam Gateau on 17 September 2019.
+//  Copyright 2019 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
+//
+#pragma once
+
+#ifndef hifi_MaterialCacheScriptingInterface_h
+#define hifi_MaterialCacheScriptingInterface_h
+
+#include <QObject>
+
+#include <ResourceCache.h>
+
+#include "MaterialCache.h"
+
+class MaterialCacheScriptingInterface : public ScriptableResourceCache, public Dependency {
+    Q_OBJECT
+
+    // Properties are copied over from ResourceCache (see ResourceCache.h for reason).
+
+    /**jsdoc
+     * The <code>TextureCache</code> API manages texture cache resources.
+     *
+     * @namespace TextureCache
+     *
+     * @hifi-interface
+     * @hifi-client-entity
+     * @hifi-avatar
+     *
+     * @property {number} numTotal - Total number of total resources. <em>Read-only.</em>
+     * @property {number} numCached - Total number of cached resource. <em>Read-only.</em>
+     * @property {number} sizeTotal - Size in bytes of all resources. <em>Read-only.</em>
+     * @property {number} sizeCached - Size in bytes of all cached resources. <em>Read-only.</em>
+     *
+     * @borrows ResourceCache.getResourceList as getResourceList
+     * @borrows ResourceCache.updateTotalSize as updateTotalSize
+     * @borrows ResourceCache.prefetch as prefetch
+     * @borrows ResourceCache.dirty as dirty
+     */
+
+public:
+    MaterialCacheScriptingInterface();
+};
+
+#endif // hifi_MaterialCacheScriptingInterface_h
diff --git a/libraries/model-baker/src/model-baker/Baker.cpp b/libraries/model-baker/src/model-baker/Baker.cpp
index c896613df5..47a8db82b8 100644
--- a/libraries/model-baker/src/model-baker/Baker.cpp
+++ b/libraries/model-baker/src/model-baker/Baker.cpp
@@ -120,7 +120,7 @@ namespace baker {
     class BakerEngineBuilder {
     public:
         using Input = VaryingSet3<hfm::Model::Pointer, hifi::VariantHash, hifi::URL>;
-        using Output = VaryingSet4<hfm::Model::Pointer, MaterialMapping, std::vector<hifi::ByteArray>, std::vector<std::vector<hifi::ByteArray>>>;
+        using Output = VaryingSet5<hfm::Model::Pointer, MaterialMapping, std::vector<hifi::ByteArray>, std::vector<bool>, std::vector<std::vector<hifi::ByteArray>>>;
         using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>;
         void build(JobModel& model, const Varying& input, Varying& output) {
             const auto& hfmModelIn = input.getN<Input>(0);
@@ -168,7 +168,8 @@ namespace baker {
             const auto buildDracoMeshInputs = BuildDracoMeshTask::Input(meshesIn, normalsPerMesh, tangentsPerMesh).asVarying();
             const auto buildDracoMeshOutputs = model.addJob<BuildDracoMeshTask>("BuildDracoMesh", buildDracoMeshInputs);
             const auto dracoMeshes = buildDracoMeshOutputs.getN<BuildDracoMeshTask::Output>(0);
-            const auto materialList = buildDracoMeshOutputs.getN<BuildDracoMeshTask::Output>(1);
+            const auto dracoErrors = buildDracoMeshOutputs.getN<BuildDracoMeshTask::Output>(1);
+            const auto materialList = buildDracoMeshOutputs.getN<BuildDracoMeshTask::Output>(2);
 
             // Parse flow data
             const auto flowData = model.addJob<ParseFlowDataTask>("ParseFlowData", mapping);
@@ -181,7 +182,7 @@ namespace baker {
             const auto buildModelInputs = BuildModelTask::Input(hfmModelIn, meshesOut, jointsOut, jointRotationOffsets, jointIndices, flowData).asVarying();
             const auto hfmModelOut = model.addJob<BuildModelTask>("BuildModel", buildModelInputs);
 
-            output = Output(hfmModelOut, materialMapping, dracoMeshes, materialList);
+            output = Output(hfmModelOut, materialMapping, dracoMeshes, dracoErrors, materialList);
         }
     };
 
@@ -212,7 +213,11 @@ namespace baker {
         return _engine->getOutput().get<BakerEngineBuilder::Output>().get2();
     }
 
-    std::vector<std::vector<hifi::ByteArray>> Baker::getDracoMaterialLists() const {
+    std::vector<bool> Baker::getDracoErrors() const {
         return _engine->getOutput().get<BakerEngineBuilder::Output>().get3();
     }
+
+    std::vector<std::vector<hifi::ByteArray>> Baker::getDracoMaterialLists() const {
+        return _engine->getOutput().get<BakerEngineBuilder::Output>().get4();
+    }
 };
diff --git a/libraries/model-baker/src/model-baker/Baker.h b/libraries/model-baker/src/model-baker/Baker.h
index 6f74cb646e..9780484fa4 100644
--- a/libraries/model-baker/src/model-baker/Baker.h
+++ b/libraries/model-baker/src/model-baker/Baker.h
@@ -33,6 +33,7 @@ namespace baker {
         hfm::Model::Pointer getHFMModel() const;
         MaterialMapping getMaterialMapping() const;
         const std::vector<hifi::ByteArray>& getDracoMeshes() const;
+        std::vector<bool> getDracoErrors() const;
         // This is a ByteArray and not a std::string because the character sequence can contain the null character (particularly for FBX materials)
         std::vector<std::vector<hifi::ByteArray>> getDracoMaterialLists() const;
 
diff --git a/libraries/model-baker/src/model-baker/BuildDracoMeshTask.cpp b/libraries/model-baker/src/model-baker/BuildDracoMeshTask.cpp
index 25a45cefe5..12347c30b1 100644
--- a/libraries/model-baker/src/model-baker/BuildDracoMeshTask.cpp
+++ b/libraries/model-baker/src/model-baker/BuildDracoMeshTask.cpp
@@ -51,7 +51,7 @@ std::vector<hifi::ByteArray> createMaterialList(const hfm::Mesh& mesh) {
     return materialList;
 }
 
-std::unique_ptr<draco::Mesh> createDracoMesh(const hfm::Mesh& mesh, const std::vector<glm::vec3>& normals, const std::vector<glm::vec3>& tangents, const std::vector<hifi::ByteArray>& materialList) {
+std::tuple<std::unique_ptr<draco::Mesh>, bool> createDracoMesh(const hfm::Mesh& mesh, const std::vector<glm::vec3>& normals, const std::vector<glm::vec3>& tangents, const std::vector<hifi::ByteArray>& materialList) {
     Q_ASSERT(normals.size() == 0 || (int)normals.size() == mesh.vertices.size());
     Q_ASSERT(mesh.colors.size() == 0 || mesh.colors.size() == mesh.vertices.size());
     Q_ASSERT(mesh.texCoords.size() == 0 || mesh.texCoords.size() == mesh.vertices.size());
@@ -68,7 +68,7 @@ std::unique_ptr<draco::Mesh> createDracoMesh(const hfm::Mesh& mesh, const std::v
     }
 
     if (numTriangles == 0) {
-        return std::unique_ptr<draco::Mesh>();
+        return std::make_tuple(std::unique_ptr<draco::Mesh>(), false);
     }
 
     draco::TriangleSoupMeshBuilder meshBuilder;
@@ -184,7 +184,7 @@ std::unique_ptr<draco::Mesh> createDracoMesh(const hfm::Mesh& mesh, const std::v
 
     if (!dracoMesh) {
         qCWarning(model_baker) << "Failed to finalize the baking of a draco Geometry node";
-        return std::unique_ptr<draco::Mesh>();
+        return std::make_tuple(std::unique_ptr<draco::Mesh>(), true);
     }
 
     // we need to modify unique attribute IDs for custom attributes
@@ -201,7 +201,7 @@ std::unique_ptr<draco::Mesh> createDracoMesh(const hfm::Mesh& mesh, const std::v
         dracoMesh->attribute(originalIndexAttributeID)->set_unique_id(DRACO_ATTRIBUTE_ORIGINAL_INDEX);
     }
     
-    return dracoMesh;
+    return std::make_tuple(std::move(dracoMesh), false);
 }
 #endif // not Q_OS_ANDROID
 
@@ -218,9 +218,13 @@ void BuildDracoMeshTask::run(const baker::BakeContextPointer& context, const Inp
     const auto& normalsPerMesh = input.get1();
     const auto& tangentsPerMesh = input.get2();
     auto& dracoBytesPerMesh = output.edit0();
-    auto& materialLists = output.edit1();
+    auto& dracoErrorsPerMesh = output.edit1();
+    auto& materialLists = output.edit2();
 
     dracoBytesPerMesh.reserve(meshes.size());
+    // vector<bool> is an exception to the std::vector conventions as it is a bit field
+    // So a bool reference to an element doesn't work
+    dracoErrorsPerMesh.resize(meshes.size());
     materialLists.reserve(meshes.size());
     for (size_t i = 0; i < meshes.size(); i++) {
         const auto& mesh = meshes[i];
@@ -231,7 +235,10 @@ void BuildDracoMeshTask::run(const baker::BakeContextPointer& context, const Inp
         materialLists.push_back(createMaterialList(mesh));
         const auto& materialList = materialLists.back();
 
-        auto dracoMesh = createDracoMesh(mesh, normals, tangents, materialList);
+        bool dracoError;
+        std::unique_ptr<draco::Mesh> dracoMesh;
+        std::tie(dracoMesh, dracoError) = createDracoMesh(mesh, normals, tangents, materialList);
+        dracoErrorsPerMesh[i] = dracoError;
 
         if (dracoMesh) {
             draco::Encoder encoder;
diff --git a/libraries/model-baker/src/model-baker/BuildDracoMeshTask.h b/libraries/model-baker/src/model-baker/BuildDracoMeshTask.h
index 0e33be3c41..ac9ad648ab 100644
--- a/libraries/model-baker/src/model-baker/BuildDracoMeshTask.h
+++ b/libraries/model-baker/src/model-baker/BuildDracoMeshTask.h
@@ -34,7 +34,7 @@ class BuildDracoMeshTask {
 public:
     using Config = BuildDracoMeshConfig;
     using Input = baker::VaryingSet3<std::vector<hfm::Mesh>, baker::NormalsPerMesh, baker::TangentsPerMesh>;
-    using Output = baker::VaryingSet2<std::vector<hifi::ByteArray>, std::vector<std::vector<hifi::ByteArray>>>;
+    using Output = baker::VaryingSet3<std::vector<hifi::ByteArray>, std::vector<bool>, std::vector<std::vector<hifi::ByteArray>>>;
     using JobModel = baker::Job::ModelIO<BuildDracoMeshTask, Input, Output, Config>;
 
     void configure(const Config& config);
diff --git a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
index cd27f8ba0b..662d5f36dc 100644
--- a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
+++ b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
@@ -107,7 +107,6 @@ void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Inpu
                     glm::quat rotationOffset = itr.value();
                     jointRotationOffsets.insert(jointIndex, rotationOffset);
                     qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset;
-                    break;
                 }
             }
         }
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 1ed1c65358..1fcfcfcc70 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -472,7 +472,10 @@ bool Geometry::areTexturesLoaded() const {
                 return false;
             }
 
-            material->checkResetOpacityMap();
+            bool changed = material->checkResetOpacityMap();
+            if (changed) {
+                qCWarning(modelnetworking) << "Material list: opacity change detected for material " << material->getName().c_str();
+            }
         }
 
         for (auto& materialMapping : _materialMapping) {
@@ -483,7 +486,10 @@ bool Geometry::areTexturesLoaded() const {
                             return false;
                         }
 
-                        materialPair.second->checkResetOpacityMap();
+                       bool changed =  materialPair.second->checkResetOpacityMap();
+                       if (changed) {
+                           qCWarning(modelnetworking) << "Mapping list: opacity change detected for material " << materialPair.first.c_str();
+                       }
                     }
                 }
             }
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 6cb1582dca..7e76df7622 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -47,6 +47,10 @@ Q_DECLARE_METATYPE(JSONCallbackParameters)
 
 const QString ACCOUNTS_GROUP = "accounts";
 
+const int POST_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND;
+const int PULL_SETTINGS_RETRY_INTERVAL = 2 * MSECS_PER_SECOND;
+const int MAX_PULL_RETRIES = 10;
+
 JSONCallbackParameters::JSONCallbackParameters(QObject* callbackReceiver,
                                                const QString& jsonCallbackMethod,
                                                const QString& errorCallbackMethod) :
@@ -70,9 +74,10 @@ QJsonObject AccountManager::dataObjectFromResponse(QNetworkReply* requestReply)
     }
 }
 
-AccountManager::AccountManager(UserAgentGetter userAgentGetter) :
+AccountManager::AccountManager(bool accountSettingsEnabled, UserAgentGetter userAgentGetter) :
     _userAgentGetter(userAgentGetter),
-    _authURL()
+    _authURL(),
+    _accountSettingsEnabled(accountSettingsEnabled)
 {
     qRegisterMetaType<OAuthAccessToken>("OAuthAccessToken");
     qRegisterMetaTypeStreamOperators<OAuthAccessToken>("OAuthAccessToken");
@@ -87,12 +92,26 @@ AccountManager::AccountManager(UserAgentGetter userAgentGetter) :
 
     qRegisterMetaType<AccountManagerAuth::Type>();
     connect(this, &AccountManager::loginComplete, this, &AccountManager::uploadPublicKey);
+    connect(this, &AccountManager::loginComplete, this, &AccountManager::requestAccountSettings);
+
+    _pullSettingsRetryTimer = new QTimer(this);
+    _pullSettingsRetryTimer->setSingleShot(true);
+    _pullSettingsRetryTimer->setInterval(PULL_SETTINGS_RETRY_INTERVAL);
+    connect(_pullSettingsRetryTimer, &QTimer::timeout, this, &AccountManager::requestAccountSettings);
+
+    _postSettingsTimer = new QTimer(this);
+    _postSettingsTimer->setInterval(POST_SETTINGS_INTERVAL);
+    connect(this, SIGNAL(accountSettingsLoaded()), _postSettingsTimer, SLOT(start()));
+    connect(this, &AccountManager::logoutComplete, _postSettingsTimer, &QTimer::stop);
+    connect(_postSettingsTimer, &QTimer::timeout, this, &AccountManager::postAccountSettings);
+    connect(qApp, &QCoreApplication::aboutToQuit, this, &AccountManager::postAccountSettings);
 }
 
-const QString DOUBLE_SLASH_SUBSTITUTE = "slashslash";
 const QString ACCOUNT_MANAGER_REQUESTED_SCOPE = "owner";
 
 void AccountManager::logout() {
+    postAccountSettings();
+    _numPullRetries = 0;
 
     // a logout means we want to delete the DataServerAccountInfo we currently have for this URL, in-memory and in file
     _accountInfo = DataServerAccountInfo();
@@ -104,6 +123,8 @@ void AccountManager::logout() {
     emit logoutComplete();
     // the username has changed to blank
     emit usernameChanged(QString());
+
+    _settings.loggedOut();
 }
 
 QString accountFileDir() {
@@ -160,33 +181,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
 
             qCDebug(networking) << "Found metaverse API account information for" << qPrintable(_authURL.toString());
         } else {
-            // we didn't have a file - see if we can migrate old settings and store them in the new file
-
-            // check if there are existing access tokens to load from settings
-            Settings settings;
-            settings.beginGroup(ACCOUNTS_GROUP);
-
-            foreach(const QString& key, settings.allKeys()) {
-                // take a key copy to perform the double slash replacement
-                QString keyCopy(key);
-                QUrl keyURL(keyCopy.replace(DOUBLE_SLASH_SUBSTITUTE, "//"));
-
-                if (keyURL == _authURL) {
-                    // pull out the stored access token and store it in memory
-                    _accountInfo = settings.value(key).value<DataServerAccountInfo>();
-
-                    qCDebug(networking) << "Migrated an access token for" << qPrintable(keyURL.toString())
-                        <<  "from previous settings file";
-                }
-            }
-            settings.endGroup();
-
-            if (_accountInfo.getAccessToken().token.isEmpty()) {
-                qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded.";
-            } else {
-                // persist the migrated settings to file
-                persistAccountToFile();
-            }
+            qCWarning(networking) << "Unable to load account file. No existing account settings will be loaded.";
         }
 
         if (_isAgent && !_accountInfo.getAccessToken().token.isEmpty() && !_accountInfo.hasProfile()) {
@@ -199,6 +194,10 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
             refreshAccessToken();
         }
 
+        if (isLoggedIn()) {
+            emit loginComplete(_authURL);
+        }
+
         // tell listeners that the auth endpoint has changed
         emit authEndpointChanged();
     }
@@ -498,7 +497,8 @@ bool AccountManager::checkAndSignalForAccessToken() {
 
 bool AccountManager::needsToRefreshToken() {
     if (!_accountInfo.getAccessToken().token.isEmpty() && _accountInfo.getAccessToken().expiryTimestamp > 0) {
-        qlonglong expireThreshold = QDateTime::currentDateTime().addSecs(1 * 60 * 60).toMSecsSinceEpoch();
+        static constexpr int MIN_REMAINING_MS = 1 * SECS_PER_HOUR * MSECS_PER_SECOND;  // 1 h
+        auto expireThreshold = QDateTime::currentDateTimeUtc().addMSecs(MIN_REMAINING_MS).toMSecsSinceEpoch();
         return _accountInfo.getAccessToken().expiryTimestamp < expireThreshold;
     } else {
         return false;
@@ -803,6 +803,116 @@ void AccountManager::requestProfileError(QNetworkReply::NetworkError error) {
     qCDebug(networking) << "AccountManager requestProfileError - " << error;
 }
 
+void AccountManager::requestAccountSettings() {
+    if (!_accountSettingsEnabled) {
+        return;
+    }
+
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+
+    QUrl lockerURL = _authURL;
+    lockerURL.setPath("/api/v1/user/locker");
+
+    QNetworkRequest lockerRequest(lockerURL);
+    lockerRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    lockerRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
+    lockerRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, _accountInfo.getAccessToken().authorizationHeaderValue());
+
+    QNetworkReply* lockerReply = networkAccessManager.get(lockerRequest);
+    connect(lockerReply, &QNetworkReply::finished, this, &AccountManager::requestAccountSettingsFinished);
+    connect(lockerReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestAccountSettingsError(QNetworkReply::NetworkError)));
+
+    _settings.startedLoading();
+}
+
+void AccountManager::requestAccountSettingsFinished() {
+    QNetworkReply* lockerReply = reinterpret_cast<QNetworkReply*>(sender());
+
+    QJsonDocument jsonResponse = QJsonDocument::fromJson(lockerReply->readAll());
+    const QJsonObject& rootObject = jsonResponse.object();
+
+    if (rootObject.contains("status") && rootObject["status"].toString() == "success") {
+        if (rootObject.contains("data") && rootObject["data"].isObject()) {
+            _settings.unpack(rootObject["data"].toObject());
+
+            emit accountSettingsLoaded();
+        } else {
+            qCDebug(networking) << "Error in response for account settings: no data object";
+            if (!_pullSettingsRetryTimer->isActive() && _numPullRetries < MAX_PULL_RETRIES) {
+                ++_numPullRetries;
+                _pullSettingsRetryTimer->start();
+            }
+        }
+    } else {
+        qCDebug(networking) << "Error in response for account settings" << lockerReply->errorString();
+        if (!_pullSettingsRetryTimer->isActive() && _numPullRetries < MAX_PULL_RETRIES) {
+            ++_numPullRetries;
+            _pullSettingsRetryTimer->start();
+        }
+    }
+}
+
+void AccountManager::requestAccountSettingsError(QNetworkReply::NetworkError error) {
+    qCWarning(networking) << "Account settings request encountered an error" << error;
+    if (!_pullSettingsRetryTimer->isActive() && _numPullRetries < MAX_PULL_RETRIES) {
+        ++_numPullRetries;
+        _pullSettingsRetryTimer->start();
+    }
+}
+
+void AccountManager::postAccountSettings() {
+    if (!_accountSettingsEnabled) {
+        return;
+    }
+
+    if (_settings.lastChangeTimestamp() <= _lastSuccessfulSyncTimestamp && _lastSuccessfulSyncTimestamp != 0) {
+        // Nothing changed, skipping settings post
+        return;
+    }
+    if (!isLoggedIn()) {
+        qCWarning(networking) << "Can't post account settings: Not logged in";
+        return;
+    }
+
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+
+    QUrl lockerURL = _authURL;
+    lockerURL.setPath("/api/v1/user/locker");
+
+    QNetworkRequest lockerRequest(lockerURL);
+    lockerRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    lockerRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
+    lockerRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    lockerRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, _accountInfo.getAccessToken().authorizationHeaderValue());
+
+    _currentSyncTimestamp = _settings.lastChangeTimestamp();
+    QJsonObject dataObj;
+    dataObj.insert("locker", _settings.pack());
+
+    auto postData = QJsonDocument(dataObj).toJson(QJsonDocument::Compact);
+
+    QNetworkReply* lockerReply = networkAccessManager.put(lockerRequest, postData);
+    connect(lockerReply, &QNetworkReply::finished, this, &AccountManager::postAccountSettingsFinished);
+    connect(lockerReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(postAccountSettingsError(QNetworkReply::NetworkError)));
+}
+
+void AccountManager::postAccountSettingsFinished() {
+    QNetworkReply* lockerReply = reinterpret_cast<QNetworkReply*>(sender());
+
+    QJsonDocument jsonResponse = QJsonDocument::fromJson(lockerReply->readAll());
+    const QJsonObject& rootObject = jsonResponse.object();
+
+    if (rootObject.contains("status") && rootObject["status"].toString() == "success") {
+        _lastSuccessfulSyncTimestamp = _currentSyncTimestamp;
+    } else {
+        qCDebug(networking) << "Error in response for account settings post" << lockerReply->errorString();
+    }
+}
+
+void AccountManager::postAccountSettingsError(QNetworkReply::NetworkError error) {
+    qCWarning(networking) << "Post encountered an error" << error;
+}
+
 void AccountManager::generateNewKeypair(bool isUserKeypair, const QUuid& domainID) {
 
     if (thread() != QThread::currentThread()) {
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index a88a5cc4e7..2e94ccf0ea 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -14,18 +14,19 @@
 
 #include <QtCore/QByteArray>
 #include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <QtCore/QUrl>
 #include <QtNetwork/QNetworkReply>
 #include <QUrlQuery>
 
+#include <DependencyManager.h>
+
+#include "AccountSettings.h"
+#include "DataServerAccountInfo.h"
 #include "NetworkingConstants.h"
 #include "NetworkAccessManager.h"
-
-#include "DataServerAccountInfo.h"
 #include "SharedUtil.h"
 
-#include <DependencyManager.h>
-
 class JSONCallbackParameters {
 public:
     JSONCallbackParameters(QObject* callbackReceiver = nullptr,
@@ -59,7 +60,7 @@ const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_US
 class AccountManager : public QObject, public Dependency {
     Q_OBJECT
 public:
-    AccountManager(UserAgentGetter userAgentGetter = DEFAULT_USER_AGENT_GETTER);
+    AccountManager(bool accountSettingsEnabled = false, UserAgentGetter userAgentGetter = DEFAULT_USER_AGENT_GETTER);
 
     QNetworkRequest createRequest(QString path, AccountManagerAuth::Type authType);
     Q_INVOKABLE void sendRequest(const QString& path,
@@ -107,6 +108,8 @@ public:
     void setConfigFileURL(const QString& fileURL) { _configFileURL = fileURL; }
     void saveLoginStatus(bool isLoggedIn);
 
+    AccountSettings& getAccountSettings() { return _settings; }
+
 public slots:
     void requestAccessToken(const QString& login, const QString& password);
     void requestAccessTokenWithSteam(QByteArray authSessionTicket);
@@ -136,6 +139,7 @@ signals:
     void logoutComplete();
     void newKeypair();
     void limitedCommerceChanged();
+    void accountSettingsLoaded();
 
 private slots:
     void handleKeypairGenerationError();
@@ -145,6 +149,13 @@ private slots:
     void publicKeyUploadFailed(QNetworkReply* reply);
     void generateNewKeypair(bool isUserKeypair = true, const QUuid& domainID = QUuid());
 
+    void requestAccountSettings();
+    void requestAccountSettingsFinished();
+    void requestAccountSettingsError(QNetworkReply::NetworkError error);
+    void postAccountSettings();
+    void postAccountSettingsFinished();
+    void postAccountSettingsError(QNetworkReply::NetworkError error);
+
 private:
     AccountManager(AccountManager const& other) = delete;
     void operator=(AccountManager const& other) = delete;
@@ -170,6 +181,14 @@ private:
 
     bool _limitedCommerce { false };
     QString _configFileURL;
+
+    bool _accountSettingsEnabled { false };
+    AccountSettings _settings;
+    quint64 _currentSyncTimestamp { 0 };
+    quint64 _lastSuccessfulSyncTimestamp { 0 };
+    int _numPullRetries { 0 };
+    QTimer* _pullSettingsRetryTimer { nullptr };
+    QTimer* _postSettingsTimer { nullptr };
 };
 
 #endif  // hifi_AccountManager_h
diff --git a/libraries/networking/src/AccountSettings.cpp b/libraries/networking/src/AccountSettings.cpp
new file mode 100644
index 0000000000..6562826dd7
--- /dev/null
+++ b/libraries/networking/src/AccountSettings.cpp
@@ -0,0 +1,55 @@
+//
+//  AccountSettings.cpp
+//  libraries/networking/src
+//
+//  Created by Clement Brisset on 9/12/19.
+//  Copyright 2019 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 "AccountSettings.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+
+#include "NetworkLogging.h"
+#include "SharedUtil.h"
+
+static QString HOME_LOCATION_KEY { "home_location" };
+
+QJsonObject AccountSettings::pack() {
+    QJsonObject data;
+
+    QReadLocker lock(&_settingsLock);
+    data.insert(HOME_LOCATION_KEY, _homeLocation);
+
+    return data;
+}
+
+void AccountSettings::unpack(QJsonObject data) {
+    QWriteLocker lock(&_settingsLock);
+
+    _lastChangeTimestamp = usecTimestampNow();
+
+    auto it = data.find(HOME_LOCATION_KEY);
+    _homeLocationState = it != data.end() && it->isString() ? Loaded : NotPresent;
+    _homeLocation = _homeLocationState == Loaded ? it->toString() : "";
+}
+
+void AccountSettings::setHomeLocation(QString homeLocation) {
+    QWriteLocker lock(&_settingsLock);
+    if (homeLocation != _homeLocation) {
+        _lastChangeTimestamp = usecTimestampNow();
+    }
+    _homeLocation = homeLocation;
+}
+
+void AccountSettings::startedLoading() {
+    _homeLocationState = Loading;
+}
+
+void AccountSettings::loggedOut() {
+    _homeLocationState = LoggedOut;
+}
diff --git a/libraries/networking/src/AccountSettings.h b/libraries/networking/src/AccountSettings.h
new file mode 100644
index 0000000000..7bec5ce767
--- /dev/null
+++ b/libraries/networking/src/AccountSettings.h
@@ -0,0 +1,47 @@
+//
+//  AccountSettings.h
+//  libraries/networking/src
+//
+//  Created by Clement Brisset on 9/12/19.
+//  Copyright 2019 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_AccountSettings_h
+#define hifi_AccountSettings_h
+
+#include <QJsonObject>
+#include <QReadWriteLock>
+#include <QString>
+
+class AccountSettings {
+public:
+    enum State {
+        LoggedOut,
+        Loading,
+        Loaded,
+        NotPresent
+    };
+
+    void loggedOut();
+    void startedLoading();
+    quint64 lastChangeTimestamp() const { return _lastChangeTimestamp; }
+
+    QJsonObject pack();
+    void unpack(QJsonObject data);
+
+    State homeLocationState() const { QReadLocker lock(&_settingsLock); return _homeLocationState; }
+    QString getHomeLocation() const { QReadLocker lock(&_settingsLock); return _homeLocation; }
+    void setHomeLocation(QString homeLocation);
+
+private:
+    mutable QReadWriteLock _settingsLock;
+    quint64 _lastChangeTimestamp { 0 };
+
+    State _homeLocationState { LoggedOut };
+    QString _homeLocation;
+};
+
+#endif /* hifi_AccountSettings_h */
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index b9a3e6f61e..44f42caec2 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -85,6 +85,13 @@ namespace {
     const QString& CACHE_ERROR_MESSAGE{ "AssetClient::Error: %1 %2" };
 }
 
+/**jsdoc
+ * Cache status value returned by {@link Assets.getCacheStatus}.
+ * @typedef {object} Assets.GetCacheStatusResult
+ * @property {string} cacheDirectory - The path of the cache directory.
+ * @property {number} cacheSize - The current cache size, in bytes.
+ * @property {number} maximumCacheSize - The maximum cache size, in bytes.
+ */
 MiniPromise::Promise AssetClient::cacheInfoRequestAsync(MiniPromise::Promise deferred) {
     if (!deferred) {
         deferred = makePromise(__FUNCTION__); // create on caller's thread
@@ -106,6 +113,20 @@ MiniPromise::Promise AssetClient::cacheInfoRequestAsync(MiniPromise::Promise def
     return deferred;
 }
 
+/**jsdoc
+ * Information on an asset in the cache. Value returned by {@link Assets.queryCacheMeta} and included in the data returned by 
+ * {@link Assets.loadFromCache}.
+ * @typedef {object} Assets.CacheItemMetaData
+ * @property {object} [attributes] - The attributes that are stored with this cache item. <em>Not used.</em>
+ * @property {Date} [expirationDate] - The date and time when the meta data expires. An invalid date means "never expires".
+ * @property {boolean} isValid - <code>true</code> if the item specified in the URL is in the cache, <code>false</code> if
+ *     it isn't.
+ * @property {Date} [lastModified] - The date and time when the meta data was last modified.
+ * @property {object} [rawHeaders] - The raw headers that are set in the meta data. <em>Not used.</em>
+ * @property {boolean} [saveToDisk] - <code>true</code> if the cache item is allowed to be store on disk,
+ *     <code>false</code> if it isn't.
+ * @property {string} [url|metaDataURL] - The ATP URL of the cached item.
+ */
 MiniPromise::Promise AssetClient::queryCacheMetaAsync(const QUrl& url, MiniPromise::Promise deferred) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "queryCacheMetaAsync", Q_ARG(const QUrl&, url), Q_ARG(MiniPromise::Promise, deferred));
@@ -202,6 +223,24 @@ namespace {
     }
 }
 
+/**jsdoc
+ * Last-modified and expiry times for a cache item.
+ * @typedef {object} Assets.SaveToCacheHeaders
+ * @property {string} [expires] - The date and time the cache value expires, in the format:
+ *     <code>"ddd, dd MMM yyyy HH:mm:ss"</code>. The default value is an invalid date, representing "never expires".
+ * @property {string} [last-modified] - The date and time the cache value was last modified, in the format:
+ *     <code>"ddd, dd MMM yyyy HH:mm:ss"</code>. The default value is the current date and time.
+ */
+/**jsdoc
+ * Information on saving asset data to the cache with {@link Assets.saveToCache}.
+ * @typedef {object} Assets.SaveToCacheResult
+ * @property {number} [byteLength] - The size of the cached data, in bytes.
+ * @property {Date} [expirationDate] - The date and time that the cache item expires. An invalid date means "never expires".
+ * @property {Date} [lastModified] - The date and time that the cache item was last modified.
+ * @property {string} [metaDataURL] - The URL associated with the cache item.
+ * @property {boolean} [success] - <code>true</code> if the save to cache request was successful.
+ * @property {string} [url] - The URL associated with the cache item.
+ */
 MiniPromise::Promise AssetClient::saveToCacheAsync(const QUrl& url, const QByteArray& data, const QVariantMap& headers, MiniPromise::Promise deferred) {
     if (!deferred) {
         deferred = makePromise(__FUNCTION__); // create on caller's thread
diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp
index 71a3cfb269..735f6dbc74 100644
--- a/libraries/networking/src/Assignment.cpp
+++ b/libraries/networking/src/Assignment.cpp
@@ -154,7 +154,7 @@ const char* Assignment::typeToString(Assignment::Type type) {
 
 QDebug operator<<(QDebug debug, const Assignment &assignment) {
     debug.nospace() << "UUID: " << qPrintable(assignment.getUUID().toString()) <<
-        ", Type: " << assignment.getType();
+        ", Type: " << assignment.getTypeName() << " (" << assignment.getType() << ")";
     
     if (!assignment.getPool().isEmpty()) {
         debug << ", Pool: " << assignment.getPool();
diff --git a/libraries/networking/src/BaseAssetScriptingInterface.cpp b/libraries/networking/src/BaseAssetScriptingInterface.cpp
index b231339e51..2a98dbf3c3 100644
--- a/libraries/networking/src/BaseAssetScriptingInterface.cpp
+++ b/libraries/networking/src/BaseAssetScriptingInterface.cpp
@@ -68,6 +68,17 @@ Promise BaseAssetScriptingInterface::queryCacheMeta(const QUrl& url) {
     return assetClient()->queryCacheMetaAsync(url, makePromise(__FUNCTION__));
 }
 
+/**jsdoc
+ * Data and information returned by {@link Assets.loadFromCache}.
+ * @typedef {object} Assets.LoadFromCacheResult
+ * @property {number} [byteLength] - The number of bytes in the retrieved data.
+ * @property {string} [contentType] - The automatically detected MIME type of the content. 
+ * @property {ArrayBuffer} data - The data bytes.
+ * @property {Assets.CacheItemMetaData} metadata - Information on the cache item.
+ * @property {string|object|ArrayBuffer} [response] - The content of the response.
+ * @property {Assets.ResponseType} responseType - The type of the content in <code>response</code>.
+ * @property {string} url - The URL of the cache item.
+ */
 Promise BaseAssetScriptingInterface::loadFromCache(const QUrl& url, bool decompress, const QString& responseType) {
     QVariantMap metaData = {
         { "_type", "cache" },
diff --git a/libraries/networking/src/BaseAssetScriptingInterface.h b/libraries/networking/src/BaseAssetScriptingInterface.h
index 497f627421..7d118e1979 100644
--- a/libraries/networking/src/BaseAssetScriptingInterface.h
+++ b/libraries/networking/src/BaseAssetScriptingInterface.h
@@ -24,6 +24,22 @@
 class BaseAssetScriptingInterface : public QObject {
     Q_OBJECT
 public:
+
+    /**jsdoc
+     * <p>Types of response that {@link Assets.decompressData}, {@link Assets.getAsset}, or {@link Assets.loadFromCache} may 
+     * provide.</p>
+     * <table>
+     *   <thead>
+     *     <tr><th>Value</th><th>Description</th></tr>
+     *   </thead>
+     *   <tbody>
+     *     <tr><td><code>"arraybuffer"</code></td><td>A binary <code>ArrayBuffer</code> object.</td></tr>
+     *     <tr><td><code>"json"</code></td><td>A parsed <code>JSON</code> object.</td></tr>
+     *     <tr><td><code>"text"</code></td><td>UTF-8 decoded <code>string</code> value.</td></tr>
+     *   </tbody>
+     * </table>
+     * @typedef {string} Assets.ResponseType
+     */
     const QStringList RESPONSE_TYPES{ "text", "arraybuffer", "json" };
     using Promise = MiniPromise::Promise;
     QSharedPointer<AssetClient> assetClient();
@@ -33,51 +49,62 @@ public:
 public slots:
 
     /**jsdoc
+     * Checks whether a string is a valid path. Note: A valid path must start with a <code>"/"</code>.
      * @function Assets.isValidPath
-     * @param {string} input
-     * @returns {boolean} 
+     * @param {string} path - The path to check.
+     * @returns {boolean} <code>true</code> if the path is a valid path, <code>false</code> if it isn't.
      */
     bool isValidPath(QString input) { return AssetUtils::isValidPath(input); }
 
     /**jsdoc
+     * Checks whether a string is a valid path and filename. Note: A valid path and filename must start with a <code>"/"</code> 
+     * but must not end with a <code>"/"</code>.
      * @function Assets.isValidFilePath
-     * @param {string} input
-     * @returns {boolean} 
+     * @param {string} path - The path to check.
+     * @returns {boolean} <code>true</code> if the path is a valid file path, <code>false</code> if it isn't.
      */
     bool isValidFilePath(QString input) { return AssetUtils::isValidFilePath(input); }
 
     /**jsdoc
+     * Gets the normalized ATP URL for a path or hash: ensures that it has <code>"atp:"</code> at the start.
      * @function Assets.getATPUrl
-     * @param {string} input
-     * @returns {string} 
+     * @param {string} url - The URL to normalize.
+     * @returns {string} The normalized ATP URL.
      */
     QUrl getATPUrl(QString input) { return AssetUtils::getATPUrl(input); }
 
     /**jsdoc
+     * Gets the SHA256 hexadecimal hash portion of an asset server URL.
      * @function Assets.extractAssetHash
-     * @param {string} input
-     * @returns {string} 
+     * @param {string} url - The URL to get the SHA256 hexadecimal hash from.
+     * @returns {string} The SHA256 hexadecimal hash portion of the URL if present and valid, <code>""</code> otherwise.
      */
     QString extractAssetHash(QString input) { return AssetUtils::extractAssetHash(input); }
 
     /**jsdoc
+     * Checks whether a string is a valid SHA256 hexadecimal hash, i.e., 64 hexadecimal characters.
      * @function Assets.isValidHash
-     * @param {string} input
-     * @returns {boolean} 
+     * @param {string} hash - The hash to check.
+     * @returns {boolean} <code>true</code> if the hash is a valid SHA256 hexadecimal string, <code>false</code> if it isn't.
      */
     bool isValidHash(QString input) { return AssetUtils::isValidHash(input); }
 
     /**jsdoc
+     * Calculates the SHA256 hash of given data.
      * @function Assets.hashData
-     * @param {} data
-     * @returns {object} 
+     * @param {string|ArrayBuffer} data - The data to calculate the hash of.
+     * @returns {ArrayBuffer} The SHA256 hash of the <code>data</code>.
      */
     QByteArray hashData(const QByteArray& data) { return AssetUtils::hashData(data); }
 
     /**jsdoc
+     * Calculates the SHA256 hash of given data, in hexadecimal format.
      * @function Assets.hashDataHex
-     * @param {} data
-     * @returns {string} 
+     * @param {string|ArrayBuffer} data - The data to calculate the hash of.
+     * @returns {string} The SHA256 hash of the <code>data</code>, in hexadecimal format.
+     * @example <caption>Calculate the hash of some text.</caption>
+     * var text = "Hello world!";
+     * print("Hash: " + Assets.hashDataHex(text));
      */
     QString hashDataHex(const QByteArray& data) { return hashData(data).toHex(); }
 
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 7d2f085d6f..d92db8a5d4 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1225,8 +1225,8 @@ void LimitedNodeList::connectedForLocalSocketTest() {
         auto localHostAddress = localIPTestSocket->localAddress();
 
         if (localHostAddress.protocol() == QAbstractSocket::IPv4Protocol) {
-            _hasTCPCheckedLocalSocket = true;
             setLocalSocket(HifiSockAddr { localHostAddress, _nodeSocket.localPort() });
+            _hasTCPCheckedLocalSocket = true;
         }
 
         localIPTestSocket->deleteLater();
@@ -1244,7 +1244,7 @@ void LimitedNodeList::errorTestingLocalSocket() {
             setLocalSocket(HifiSockAddr { getGuessedLocalAddress(), _nodeSocket.localPort() });
         }
 
-        localIPTestSocket->deleteLater();;
+        localIPTestSocket->deleteLater();
     }
 }
 
diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp
index a48922726e..b7807bc62d 100644
--- a/libraries/networking/src/NetworkPeer.cpp
+++ b/libraries/networking/src/NetworkPeer.cpp
@@ -140,7 +140,7 @@ void NetworkPeer::activatePublicSocket() {
 
 void NetworkPeer::activateSymmetricSocket() {
     if (_activeSocket != &_symmetricSocket) {
-        qCDebug(networking) << "Activating symmetric socket for network peer with ID" << uuidStringWithoutCurlyBraces(_uuid);
+        qCDebug(networking) << "Activating symmetric socket (" << _symmetricSocket << ") for network peer with ID" << uuidStringWithoutCurlyBraces(_uuid);
         setActiveSocket(&_symmetricSocket);
     }
 }
diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 88e6b14ec7..88a4f5bf32 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -148,6 +148,8 @@ void ResourceCacheSharedItems::clear() {
 
 ScriptableResourceCache::ScriptableResourceCache(QSharedPointer<ResourceCache> resourceCache) {
     _resourceCache = resourceCache;
+    connect(&(*_resourceCache), &ResourceCache::dirty,
+        this, &ScriptableResourceCache::dirty, Qt::DirectConnection);
 }
 
 QVariantList ScriptableResourceCache::getResourceList() {
@@ -323,7 +325,11 @@ QVariantList ResourceCache::getResourceList() {
         BLOCKING_INVOKE_METHOD(this, "getResourceList",
             Q_RETURN_ARG(QVariantList, list));
     } else {
-        auto resources = _resources.uniqueKeys();
+        QList<QUrl> resources;
+        {
+            QReadLocker locker(&_resourcesLock);
+            resources = _resources.uniqueKeys();
+        }
         list.reserve(resources.size());
         for (auto& resource : resources) {
             list << resource;
@@ -510,7 +516,7 @@ void ResourceCache::updateTotalSize(const qint64& deltaSize) {
 
     emit dirty();
 }
- 
+
 QList<QSharedPointer<Resource>> ResourceCache::getLoadingRequests() {
     return DependencyManager::get<ResourceCacheSharedItems>()->getLoadingRequests();
 }
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index e1f3098658..4213d92fc0 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -317,6 +317,13 @@ class ScriptableResourceCache : public QObject {
     Q_PROPERTY(size_t sizeTotal READ getSizeTotalResources NOTIFY dirty)
     Q_PROPERTY(size_t sizeCached READ getSizeCachedResources NOTIFY dirty)
 
+    /**jsdoc
+    * @property {number} numGlobalQueriesPending - Total number of global queries pending (across all resource managers). <em>Read-only.</em>
+    * @property {number} numGlobalQueriesLoading - Total number of global queries loading (across all resource managers). <em>Read-only.</em>
+    */
+    Q_PROPERTY(size_t numGlobalQueriesPending READ getNumGlobalQueriesPending NOTIFY dirty)
+    Q_PROPERTY(size_t numGlobalQueriesLoading READ getNumGlobalQueriesLoading NOTIFY dirty)
+
 public:
     ScriptableResourceCache(QSharedPointer<ResourceCache> resourceCache);
 
@@ -390,6 +397,9 @@ private:
     size_t getSizeTotalResources() const { return _resourceCache->getSizeTotalResources(); }
     size_t getNumCachedResources() const { return _resourceCache->getNumCachedResources(); }
     size_t getSizeCachedResources() const { return _resourceCache->getSizeCachedResources(); }
+
+    size_t getNumGlobalQueriesPending() const { return ResourceCache::getPendingRequestCount(); }
+    size_t getNumGlobalQueriesLoading() const { return ResourceCache::getLoadingRequestCount(); }
 };
 
 /// Base class for resources.
diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp
index b8a8f65080..e680b22fdc 100644
--- a/libraries/networking/src/ThreadedAssignment.cpp
+++ b/libraries/networking/src/ThreadedAssignment.cpp
@@ -29,6 +29,9 @@ ThreadedAssignment::ThreadedAssignment(ReceivedMessage& message) :
     _domainServerTimer(this),
     _statsTimer(this)
 {
+    // use <mixer-type> as a temporary targetName name until commonInit can be called later
+    LogHandler::getInstance().setTargetName(QString("<%1>").arg(getTypeName()));
+
     static const int STATS_TIMEOUT_MS = 1000;
     _statsTimer.setInterval(STATS_TIMEOUT_MS); // 1s, Qt::CoarseTimer acceptable
     connect(&_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket);
diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp
index 872ee4dd4c..338b95163f 100644
--- a/libraries/networking/src/udt/Connection.cpp
+++ b/libraries/networking/src/udt/Connection.cpp
@@ -269,7 +269,7 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
     bool wasDuplicate = false;
     
     if (sequenceNumber > _lastReceivedSequenceNumber) {
-        // Update largest recieved sequence number
+        // Update largest received sequence number
         _lastReceivedSequenceNumber = sequenceNumber;
     } else {
         // Otherwise, it could be a resend, try and remove it from the loss list
@@ -312,9 +312,7 @@ void Connection::processControl(ControlPacketPointer controlPacket) {
                 // We're already in a state where we've received a handshake ack, so we are likely in a state
                 // where the other end expired our connection. Let's reset.
 
-#ifdef UDT_CONNECTION_DEBUG
-                qCDebug(networking) << "Got HandshakeRequest from" << _destination << ", stopping SendQueue";
-#endif
+                qCDebug(networking) << "Got HandshakeRequest from" << _destination << "while active, stopping SendQueue";
                 _hasReceivedHandshakeACK = false;
                 stopSendQueue();
             }
@@ -333,7 +331,7 @@ void Connection::processACK(ControlPacketPointer controlPacket) {
     // validate that this isn't a BS ACK
     if (ack > getSendQueue().getCurrentSequenceNumber()) {
         // in UDT they specifically break the connection here - do we want to do anything?
-        Q_ASSERT_X(false, "Connection::processACK", "ACK recieved higher than largest sent sequence number");
+        Q_ASSERT_X(false, "Connection::processACK", "ACK received higher than largest sent sequence number");
         return;
     }
     
diff --git a/libraries/networking/src/udt/Connection.h b/libraries/networking/src/udt/Connection.h
index 47edb021c8..00d5beb5ab 100644
--- a/libraries/networking/src/udt/Connection.h
+++ b/libraries/networking/src/udt/Connection.h
@@ -73,6 +73,7 @@ public:
     void setMaxBandwidth(int maxBandwidth);
 
     void sendHandshakeRequest();
+    bool hasReceivedHandshake() const { return _hasReceivedHandshake; }
     
     void recordSentUnreliablePackets(int wireSize, int payloadSize);
     void recordReceivedUnreliablePackets(int wireSize, int payloadSize);
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index dc1c79e0eb..52a8c8db16 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -274,6 +274,7 @@ enum class EntityVersion : PacketVersion {
     TextUnlit,
     ShadowBiasAndDistance,
     TextEntityFonts,
+    ScriptServerKinematicMotion,
 
     // Add new versions above here
     NUM_PACKET_TYPE,
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index c25075171b..2d99f3649b 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -239,15 +239,24 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc
     int pending = _udpSocket.bytesToWrite();
     if (bytesWritten < 0 || pending) {
         int wsaError = 0;
+        static std::atomic<int> previousWsaError (0);
 #ifdef WIN32
         wsaError = WSAGetLastError();
 #endif
-        qCDebug(networking) << "udt::writeDatagram (" << _udpSocket.state() << sockAddr << ") error - " << wsaError << _udpSocket.error() << "(" << _udpSocket.errorString() << ")"
+        QString errorString;
+        QDebug(&errorString) << "udt::writeDatagram (" << _udpSocket.state() << sockAddr << ") error - "
+            << wsaError << _udpSocket.error() << "(" << _udpSocket.errorString() << ")"
             << (pending ? "pending bytes:" : "pending:") << pending;
+
+        if (previousWsaError.exchange(wsaError) != wsaError) {
+            qCDebug(networking).noquote() << errorString;
 #ifdef DEBUG_EVENT_QUEUE
-        int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread());
-        qCDebug(networking) << "Networking queue size - " << nodeListQueueSize << "writing datagram to" << sockAddr;
-#endif // DEBUG_EVENT_QUEUE    
+            int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread());
+            qCDebug(networking) << "Networking queue size - " << nodeListQueueSize << "writing datagram to" << sockAddr;
+#endif  // DEBUG_EVENT_QUEUE
+        } else {
+            HIFI_FCDEBUG(networking(), errorString.toLatin1().constData());
+        }
     }
 
     return bytesWritten;
@@ -263,7 +272,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi
         if (filterCreate && _connectionCreationFilterOperator && !_connectionCreationFilterOperator(sockAddr)) {
             // the connection creation filter did not allow us to create a new connection
 #ifdef UDT_CONNECTION_DEBUG
-            qCDebug(networking) << "Socket::findOrCreateConnection refusing to create connection for" << sockAddr
+            qCDebug(networking) << "Socket::findOrCreateConnection refusing to create Connection class for" << sockAddr
                 << "due to connection creation filter";
 #endif // UDT_CONNECTION_DEBUG
             return nullptr;
@@ -279,7 +288,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi
             QObject::connect(connection.get(), &Connection::receiverHandshakeRequestComplete,
                              this, &Socket::clientHandshakeRequestComplete);
 
-            qCDebug(networking) << "Creating new connection to" << sockAddr;
+            qCDebug(networking) << "Creating new Connection class for" << sockAddr;
 
             it = _connectionsHash.insert(it, std::make_pair(sockAddr, std::move(connection)));
         }
@@ -525,16 +534,25 @@ std::vector<HifiSockAddr> Socket::getConnectionSockAddrs() {
 
 void Socket::handleSocketError(QAbstractSocket::SocketError socketError) {
     int wsaError = 0;
+    static std::atomic<int> previousWsaError(0);
 #ifdef WIN32
     wsaError = WSAGetLastError();
 #endif
     int pending = _udpSocket.bytesToWrite();
-    qCDebug(networking) << "udt::Socket (" << _udpSocket.state() << ") error - " << wsaError << socketError << "(" << _udpSocket.errorString() << ")"
-        << (pending ? "pending bytes:" : "pending:") << pending;
+    QString errorString;
+    QDebug(&errorString) << "udt::Socket (" << _udpSocket.state() << ") error - " << wsaError << socketError <<
+        "(" << _udpSocket.errorString() << ")" << (pending ? "pending bytes:" : "pending:")
+        << pending;
+
+    if (previousWsaError.exchange(wsaError) != wsaError) {
+        qCDebug(networking).noquote() << errorString;
 #ifdef DEBUG_EVENT_QUEUE
-    int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread());
-    qCDebug(networking) << "Networking queue size - " << nodeListQueueSize;
-#endif // DEBUG_EVENT_QUEUE
+        int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread());
+        qCDebug(networking) << "Networking queue size - " << nodeListQueueSize;
+#endif  // DEBUG_EVENT_QUEUE
+    } else {
+        HIFI_FCDEBUG(networking(), errorString.toLatin1().constData());
+    }
 }
 
 void Socket::handleStateChanged(QAbstractSocket::SocketState socketState) {
@@ -546,26 +564,25 @@ void Socket::handleStateChanged(QAbstractSocket::SocketState socketState) {
 void Socket::handleRemoteAddressChange(HifiSockAddr previousAddress, HifiSockAddr currentAddress) {
     {
         Lock connectionsLock(_connectionsHashMutex);
-        _connectionsHash.erase(currentAddress);
 
         const auto connectionIter = _connectionsHash.find(previousAddress);
-        if (connectionIter != _connectionsHash.end()) {
+        // Don't move classes that are unused so far.
+        if (connectionIter != _connectionsHash.end() && connectionIter->second->hasReceivedHandshake()) {
             auto connection = move(connectionIter->second);
             _connectionsHash.erase(connectionIter);
             connection->setDestinationAddress(currentAddress);
             _connectionsHash[currentAddress] = move(connection);
-        }
-    }
+            connectionsLock.unlock();
+            qCDebug(networking) << "Moved Connection class from" << previousAddress << "to" << currentAddress;
 
-    {
-        Lock sequenceNumbersLock(_unreliableSequenceNumbersMutex);
-        _unreliableSequenceNumbers.erase(currentAddress);
+            Lock sequenceNumbersLock(_unreliableSequenceNumbersMutex);
+            const auto sequenceNumbersIter = _unreliableSequenceNumbers.find(previousAddress);
+            if (sequenceNumbersIter != _unreliableSequenceNumbers.end()) {
+                auto sequenceNumbers = sequenceNumbersIter->second;
+                _unreliableSequenceNumbers.erase(sequenceNumbersIter);
+                _unreliableSequenceNumbers[currentAddress] = sequenceNumbers;
+            }
 
-        const auto sequenceNumbersIter = _unreliableSequenceNumbers.find(previousAddress);
-        if (sequenceNumbersIter != _unreliableSequenceNumbers.end()) {
-            auto sequenceNumbers = sequenceNumbersIter->second;
-            _unreliableSequenceNumbers.erase(sequenceNumbersIter);
-            _unreliableSequenceNumbers[currentAddress] = sequenceNumbers;
         }
     }
 }
diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index 7b84205691..2d0bc7380f 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -37,7 +37,11 @@ OctreeEditPacketSender::~OctreeEditPacketSender() {
 
 
 bool OctreeEditPacketSender::serversExist() const {
-    auto node = DependencyManager::get<NodeList>()->soloNodeOfType(getMyNodeType());
+    auto nodeList = DependencyManager::get<NodeList>();
+    if (!nodeList) {
+        return false;
+    }
+    auto node = nodeList->soloNodeOfType(getMyNodeType());
     return node && node->getActiveSocket();
 }
 
diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index e102388822..a796ea28a0 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -129,7 +129,7 @@ CharacterController::CharacterController() {
     // ATM CharacterController is a singleton.  When we want more we'll have to
     // overhaul the applyPairwiseFilter() logic to handle multiple instances.
     ++_numCharacterControllers;
-    assert(numCharacterControllers == 1);
+    assert(_numCharacterControllers == 1);
 }
 
 CharacterController::~CharacterController() {
@@ -189,7 +189,7 @@ void CharacterController::addToWorld() {
     _rigidBody->setCollisionFlags(btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
 
     // enable CCD
-    _rigidBody->setCcdSweptSphereRadius(_radius);
+    _rigidBody->setCcdSweptSphereRadius(_halfHeight);
     _rigidBody->setCcdMotionThreshold(_radius);
 
     btCollisionShape* shape = _rigidBody->getCollisionShape();
@@ -225,6 +225,7 @@ bool CharacterController::checkForSupport(btCollisionWorld* collisionWorld) {
     float deepestDistance = 0.0f;
     float strongestImpulse = 0.0f;
 
+    _netCollisionImpulse = btVector3(0.0f, 0.0f, 0.0f);
     for (int i = 0; i < numManifolds; i++) {
         btPersistentManifold* contactManifold = dispatcher->getManifoldByIndexInternal(i);
         if (_rigidBody == contactManifold->getBody1() || _rigidBody == contactManifold->getBody0()) {
@@ -245,6 +246,7 @@ bool CharacterController::checkForSupport(btCollisionWorld* collisionWorld) {
                     deepestDistance = distance;
                 }
                 float impulse = contact.getAppliedImpulse();
+                _netCollisionImpulse += impulse * normal;
                 if (impulse > strongestImpulse) {
                     strongestImpulse = impulse;
                 }
@@ -554,7 +556,7 @@ void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const
 
     if (_rigidBody) {
         // update CCD with new _radius
-        _rigidBody->setCcdSweptSphereRadius(_radius);
+        _rigidBody->setCcdSweptSphereRadius(_halfHeight);
         _rigidBody->setCcdMotionThreshold(_radius);
     }
 }
@@ -568,6 +570,12 @@ void CharacterController::setPhysicsEngine(const PhysicsEnginePointer& engine) {
     }
 }
 
+float CharacterController::getCollisionBrakeAttenuationFactor() const {
+    // _collisionBrake ranges from 0.0 (no brake) to 1.0 (max brake)
+    // which we use to compute a corresponding attenutation factor from 1.0 to 0.5
+    return 1.0f - 0.5f * _collisionBrake;
+}
+
 void CharacterController::setCollisionless(bool collisionless) {
     if (collisionless != _collisionless) {
         _collisionless = collisionless;
@@ -777,14 +785,73 @@ void CharacterController::computeNewVelocity(btScalar dt, btVector3& velocity) {
     velocity += dt * _linearAcceleration;
     // Note the differences between these two variables:
     // _targetVelocity = ideal final velocity according to input
-    // velocity = real final velocity after motors are applied to current velocity
+    // velocity = new final velocity after motors are applied to currentVelocity
 
-    bool gettingStuck = !_isStuck && _stuckTransitionCount > 1 && _state == State::Hover;
-    if (gettingStuck && velocity.length2() > currentVelocity.length2()) {
-        // we are probably trying to fly fast into a mesh obstacle
-        // which is causing us to tickle the "stuck" detection code
-        // so we average our new velocity with currentVeocity to prevent a "safe landing" response
-        velocity = 0.5f * (velocity + currentVelocity);
+    // but we want to avoid getting stuck and tunelling through geometry so we perform
+    // further checks and modify/abandon our velocity calculations
+
+    const float SAFE_COLLISION_SPEED = glm::abs(STUCK_PENETRATION) * (float)NUM_SUBSTEPS_PER_SECOND;
+    const float SAFE_COLLISION_SPEED_SQUARED = SAFE_COLLISION_SPEED * SAFE_COLLISION_SPEED;
+
+    // NOTE: the thresholds are negative which indicates the vectors oppose each other
+    // and which means comparison operators against them may look wrong at first glance.
+    // The magnitudes of the thresholds have been tuned manually.
+    const float STRONG_OPPOSING_IMPACT_THRESHOLD = -1000.0f;
+    const float VERY_STRONG_OPPOSING_IMPACT_THRESHOLD = -2000.0f;
+    float velocityDotImpulse = velocity.dot(_netCollisionImpulse);
+
+    const float COLLISION_BRAKE_TIMESCALE = 0.20f; // must be > PHYSICS_ENGINE_FIXED_SUBSTEP for stability
+    const float MIN_COLLISION_BRAKE = 0.05f;
+    if ((velocityDotImpulse > VERY_STRONG_OPPOSING_IMPACT_THRESHOLD && _stuckTransitionCount == 0) || _isStuck) {
+        // we are either definitely NOT stuck (in which case nothing to do)
+        // or definitely are (in which case we'll be temporarily disabling collisions with the offending object
+        // and we don't mind tunnelling as an escape route out of stuck)
+        if (_collisionBrake > MIN_COLLISION_BRAKE) {
+            _collisionBrake *= (1.0f - dt / COLLISION_BRAKE_TIMESCALE);
+            if (_collisionBrake < MIN_COLLISION_BRAKE) {
+                _collisionBrake = 0.0f;
+            }
+        }
+        return;
+    }
+
+    if (velocityDotImpulse < VERY_STRONG_OPPOSING_IMPACT_THRESHOLD ||
+            (velocityDotImpulse < STRONG_OPPOSING_IMPACT_THRESHOLD && velocity.length2() > SAFE_COLLISION_SPEED_SQUARED)) {
+        if (_collisionBrake < 1.0f) {
+            _collisionBrake += (1.0f - _collisionBrake) * (dt / COLLISION_BRAKE_TIMESCALE);
+            const float MAX_COLLISION_BRAKE = 1.0f - MIN_COLLISION_BRAKE;
+            if (_collisionBrake > MAX_COLLISION_BRAKE) {
+                _collisionBrake = 1.0f;
+            }
+        }
+
+        // NOTE about REFLECTION_COEFFICIENT: a value of 2.0 provides full reflection
+        // (zero attenuation) whereas a value of 1.0 zeros it (full attenuation).
+        const float REFLECTION_COEFFICIENT = 1.1f;
+
+        if (velocity.dot(currentVelocity) > 0.0f) {
+            // our new velocity points in the same direction as our currentVelocity
+            // but negative "impact" means new velocity points against netCollisionImpulse
+            if (currentVelocity.dot(_netCollisionImpulse) > 0.0f) {
+                // currentVelocity points positively with netCollisionImpulse --> trust physics to save us
+                velocity = currentVelocity;
+            } else {
+                // can't trust physics --> use new velocity but reflect it
+                btVector3 impulseDirection = _netCollisionImpulse.normalized();
+                velocity -= (REFLECTION_COEFFICIENT * velocity.dot(impulseDirection)) * impulseDirection;
+            }
+        } else {
+            // currentVelocity points against new velocity, which means it is probably better but...
+            // when the physical simulation starts to fail (e.g. in deep penetration in mesh geometry)
+            // the currentVelocity can point in unhelpful directions, so we check it and reflect any component
+            // opposing netCollisionImpulse in hopes netCollisionImpulse points toward good exit
+            if (currentVelocity.dot(_netCollisionImpulse) < 0.0f) {
+                // currentVelocity points against netCollisionImpulse --> reflect
+                btVector3 impulseDirection = _netCollisionImpulse.normalized();
+                currentVelocity -= (REFLECTION_COEFFICIENT * currentVelocity.dot(impulseDirection)) * impulseDirection;
+            }
+            velocity = currentVelocity;
+        }
     }
 }
 
diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h
index 77a75c7bbd..e7ad3ddfa8 100755
--- a/libraries/physics/src/CharacterController.h
+++ b/libraries/physics/src/CharacterController.h
@@ -128,6 +128,7 @@ public:
     void setPhysicsEngine(const PhysicsEnginePointer& engine);
     bool isEnabledAndReady() const { return (bool)_physicsEngine; }
     bool isStuck() const { return _isStuck; }
+    float getCollisionBrakeAttenuationFactor() const;
 
     void setCollisionless(bool collisionless);
 
@@ -215,11 +216,13 @@ protected:
     btVector3 _followLinearDisplacement;
     btQuaternion _followAngularDisplacement;
     btVector3 _linearAcceleration;
+    btVector3 _netCollisionImpulse;
 
     State _state;
     bool _isPushingUp;
     bool _isStuck { false };
     bool _isSeated { false };
+    float _collisionBrake { 0.0f };
 
     PhysicsEnginePointer _physicsEngine { nullptr };
     btRigidBody* _rigidBody { nullptr };
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 67aa7d2d7d..e48f0603bd 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -84,48 +84,57 @@ EntityMotionState::~EntityMotionState() {
 }
 
 void EntityMotionState::updateServerPhysicsVariables() {
-    if (_ownershipState != EntityMotionState::OwnershipState::LocallyOwned) {
-        // only slam these values if we are NOT the simulation owner
-        Transform localTransform;
-        _entity->getLocalTransformAndVelocities(localTransform, _serverVelocity, _serverAngularVelocity);
-        _serverPosition = localTransform.getTranslation();
-        _serverRotation = localTransform.getRotation();
-        _serverAcceleration = _entity->getAcceleration();
-        _serverActionData = _entity->getDynamicData();
-        _lastStep = ObjectMotionState::getWorldSimulationStep();
-    }
+    // only slam these values if we are NOT the simulation owner
+    Transform localTransform;
+    _entity->getLocalTransformAndVelocities(localTransform, _serverVelocity, _serverAngularVelocity);
+    _serverPosition = localTransform.getTranslation();
+    _serverRotation = localTransform.getRotation();
+    _serverAcceleration = _entity->getAcceleration();
+    _serverActionData = _entity->getDynamicData();
+    _lastStep = ObjectMotionState::getWorldSimulationStep();
 }
 
 void EntityMotionState::handleDeactivation() {
-   if (_entity->getDirtyFlags() & (Simulation::DIRTY_TRANSFORM | Simulation::DIRTY_VELOCITIES)) {
-       // Some non-physical event (script-call or network-packet) has modified the entity's transform and/or velocities
-       // at the last minute before deactivation --> the values stored in _server* and _body are stale.
-       // We assume the EntityMotionState is the last to know, so we copy from EntityItem and let things sort themselves out.
-       Transform localTransform;
-       _entity->getLocalTransformAndVelocities(localTransform, _serverVelocity, _serverAngularVelocity);
-       _serverPosition = localTransform.getTranslation();
-       _serverRotation = localTransform.getRotation();
-       _serverAcceleration = _entity->getAcceleration();
-       _serverActionData = _entity->getDynamicData();
-       _lastStep = ObjectMotionState::getWorldSimulationStep();
-   } else {
-       // copy _server data to entity
-       Transform localTransform = _entity->getLocalTransform();
-       localTransform.setTranslation(_serverPosition);
-       localTransform.setRotation(_serverRotation);
-       _entity->setLocalTransformAndVelocities(localTransform, ENTITY_ITEM_ZERO_VEC3, ENTITY_ITEM_ZERO_VEC3);
-       // and also to RigidBody
-       btTransform worldTrans;
-       worldTrans.setOrigin(glmToBullet(_entity->getWorldPosition()));
-       worldTrans.setRotation(glmToBullet(_entity->getWorldOrientation()));
-       _body->setWorldTransform(worldTrans);
-       // no need to update velocities... should already be zero
-   }
+    if (_entity->getDirtyFlags() & (Simulation::DIRTY_TRANSFORM | Simulation::DIRTY_VELOCITIES)) {
+        // Some non-physical event (script-call or network-packet) has modified the entity's transform and/or
+        // velocities at the last minute before deactivation --> the values stored in _server* and _body are stale.
+        // We assume the EntityMotionState is the last to know, so we copy from EntityItem to _server* variables
+        // here but don't clear the flags --> the will body be set straight before next simulation step.
+        updateServerPhysicsVariables();
+    } else if (_body->isStaticOrKinematicObject() && _ownershipState != EntityMotionState::OwnershipState::LocallyOwned) {
+            // To allow the ESS to move entities around in a kinematic way we had to remove the requirement that
+            // every moving+simulated entity has an authoritative simulation owner.  As a result, we cannot rely
+            // on a final authoritative update of kinmatic objects prior to deactivation in the local simulation.
+            // For this case (unowned kinematic objects) we update the _server* variables for good measure but
+            // leave the entity and body alone. They should have been updated correctly in the last call to
+            // EntityMotionState::getWorldTransform().
+            updateServerPhysicsVariables();
+    } else {
+        // copy _server data to entity
+        Transform localTransform = _entity->getLocalTransform();
+        localTransform.setTranslation(_serverPosition);
+        localTransform.setRotation(_serverRotation);
+        _entity->setLocalTransformAndVelocities(localTransform, ENTITY_ITEM_ZERO_VEC3, ENTITY_ITEM_ZERO_VEC3);
+        // and also to RigidBody
+        btTransform worldTrans;
+        worldTrans.setOrigin(glmToBullet(_entity->getWorldPosition()));
+        worldTrans.setRotation(glmToBullet(_entity->getWorldOrientation()));
+        _body->setWorldTransform(worldTrans);
+        // no need to update velocities... should already be zero
+    }
+    if (!isLocallyOwned()) {
+        // HACK: To allow the ESS to move entities around in a kinematic way we had to remove the requirement that
+        // every moving+simulated entity has an authoritative simulation owner.  As a result, we cannot rely
+        // on a simulation owner to update the QueryAACube on the entity-server.
+        _entity->updateQueryAACube();
+    }
 }
 
 // virtual
 void EntityMotionState::handleEasyChanges(uint32_t& flags) {
-    updateServerPhysicsVariables();
+    if (_ownershipState != EntityMotionState::OwnershipState::LocallyOwned) {
+        updateServerPhysicsVariables();
+    }
     ObjectMotionState::handleEasyChanges(flags);
 
     if (flags & Simulation::DIRTY_SIMULATOR_ID) {
@@ -740,7 +749,8 @@ bool EntityMotionState::shouldSendBid() const {
         && (_region == workload::Region::R1)
         && _ownershipState != EntityMotionState::OwnershipState::Unownable
         && glm::max(glm::max(VOLUNTEER_SIMULATION_PRIORITY, _bumpedPriority), _entity->getScriptSimulationPriority()) >= _entity->getSimulationPriority()
-        && !_entity->getLocked();
+        && !_entity->getLocked()
+        && (!_body->isStaticOrKinematicObject() || _entity->stillHasMyGrab());
 }
 
 void EntityMotionState::setRigidBody(btRigidBody* body) {
diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp
index 85c53af10a..df8c3fa32e 100644
--- a/libraries/physics/src/PhysicalEntitySimulation.cpp
+++ b/libraries/physics/src/PhysicalEntitySimulation.cpp
@@ -75,7 +75,8 @@ void PhysicalEntitySimulation::removeEntityInternal(EntityItemPointer entity) {
         if (motionState) {
             removeOwnershipData(motionState);
             _entitiesToRemoveFromPhysics.insert(entity);
-        } else if (entity->isDead() && entity->getElement()) {
+        }
+        if (entity->isDead() && entity->getElement()) {
             _deadEntities.insert(entity);
         }
     }
@@ -528,6 +529,8 @@ void PhysicalEntitySimulation::handleChangedMotionStates(const VectorOfMotionSta
                     addOwnership(entityState);
                 } else if (entityState->shouldSendBid()) {
                     addOwnershipBid(entityState);
+                } else {
+                    entityState->getEntity()->updateQueryAACube();
                 }
             }
         }
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 0d0209e35f..8f1184904e 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -84,6 +84,11 @@ bool isDisabled(QJsonObject metaData) {
     return false;
 }
 
+int PluginManager::instantiate() {
+    auto loaders = getLoadedPlugins();
+    return std::count_if(loaders.begin(), loaders.end(), [](const auto& loader) { return (bool)loader->instance(); });
+}
+
  auto PluginManager::getLoadedPlugins() const -> const LoaderList& {
     static std::once_flag once;
     static LoaderList loadedPlugins;
@@ -105,6 +110,16 @@ bool isDisabled(QJsonObject metaData) {
             pluginDir.setNameFilters(QStringList() << "libplugins_lib*.so");
 #endif
             auto candidates = pluginDir.entryList();
+
+            if (_enableScriptingPlugins.get()) {
+                QDir scriptingPluginDir{ pluginDir };
+                scriptingPluginDir.cd("scripting");
+                qCDebug(plugins) << "Loading scripting plugins from " << scriptingPluginDir.path();
+                for (auto plugin : scriptingPluginDir.entryList()) {
+                    candidates << "scripting/" + plugin;
+                }
+            }
+
             for (auto plugin : candidates) {
                 qCDebug(plugins) << "Attempting plugin" << qPrintable(plugin);
                 QSharedPointer<QPluginLoader> loader(new QPluginLoader(pluginPath + plugin));
@@ -139,6 +154,8 @@ bool isDisabled(QJsonObject metaData) {
                     qCDebug(plugins) << " " << qPrintable(loader->errorString());
                 }
             }
+        } else {
+            qWarning() << "pluginPath does not exit..." << pluginDir;
         }
     });
     return loadedPlugins;
diff --git a/libraries/plugins/src/plugins/PluginManager.h b/libraries/plugins/src/plugins/PluginManager.h
index 1a578c7406..eb377a2c8e 100644
--- a/libraries/plugins/src/plugins/PluginManager.h
+++ b/libraries/plugins/src/plugins/PluginManager.h
@@ -10,6 +10,7 @@
 #include <QObject>
 
 #include <DependencyManager.h>
+#include <SettingHandle.h>
 
 #include "Forward.h"
 
@@ -38,6 +39,7 @@ public:
     void saveSettings();
     void setContainer(PluginContainer* container) { _container = container; }
 
+    int instantiate();
     void shutdown();
 
     // Application that have statically linked plugins can expose them to the plugin manager with these function
@@ -69,6 +71,9 @@ private:
     using LoaderList = QList<Loader>;
 
     const LoaderList& getLoadedPlugins() const;
+    Setting::Handle<bool> _enableScriptingPlugins {
+        "private/enableScriptingPlugins", (bool)qgetenv("enableScriptingPlugins").toInt()
+    };
 };
 
 // TODO: we should define this value in CMake, and then use CMake
diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
index 117ff61c6e..d9fc8117bd 100644
--- a/libraries/qml/src/qml/OffscreenSurface.cpp
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -214,6 +214,8 @@ bool OffscreenSurface::eventFilter(QObject* originalDestination, QEvent* event)
                     fakeMouseEventType = QEvent::MouseButtonRelease;
                     fakeMouseButtons = Qt::NoButton;
                     break;
+                default:
+                    Q_UNREACHABLE();
             }
             // Same case as OffscreenUi.cpp::eventFilter: touch events are always being accepted so we now use mouse events and consider one touch, touchPoints()[0].
             QMouseEvent fakeMouseEvent(fakeMouseEventType, originalEvent->touchPoints()[0].pos(), fakeMouseButton, fakeMouseButtons, Qt::NoModifier);
@@ -291,6 +293,10 @@ void OffscreenSurface::setMaxFps(uint8_t maxFps) {
 }
 
 void OffscreenSurface::load(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) {
+    loadFromQml(qmlSource, parent, callback);
+}
+
+void OffscreenSurface::loadFromQml(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) {
     loadInternal(qmlSource, false, parent, [callback](QQmlContext* context, QQuickItem* newItem) {
         QJSValue(callback).call(QJSValueList() << context->engine()->newQObject(newItem));
     });
diff --git a/libraries/qml/src/qml/OffscreenSurface.h b/libraries/qml/src/qml/OffscreenSurface.h
index 528baf76be..8209398e05 100644
--- a/libraries/qml/src/qml/OffscreenSurface.h
+++ b/libraries/qml/src/qml/OffscreenSurface.h
@@ -111,6 +111,7 @@ signals:
     void rootItemCreated(QQuickItem* rootContext);
 
 protected:
+    virtual void loadFromQml(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback);
     bool eventFilter(QObject* originalDestination, QEvent* event) override;
     bool filterEnabled(QObject* originalDestination, QEvent* event) const;
 
diff --git a/libraries/recording/src/recording/Deck.cpp b/libraries/recording/src/recording/Deck.cpp
index 4d65f0eb1b..bdbbc05d50 100644
--- a/libraries/recording/src/recording/Deck.cpp
+++ b/libraries/recording/src/recording/Deck.cpp
@@ -103,6 +103,10 @@ float Deck::position() const {
     return Frame::frameTimeToSeconds(currentPosition);
 }
 
+void Deck::setVolume(float volume) { 
+    _volume = std::min(std::max(volume, 0.0f), 1.0f);
+}
+
 static const Frame::Time MIN_FRAME_WAIT_INTERVAL = Frame::secondsToFrameTime(0.001f);
 static const Frame::Time MAX_FRAME_PROCESSING_TIME = Frame::secondsToFrameTime(0.004f);
 
diff --git a/libraries/recording/src/recording/Deck.h b/libraries/recording/src/recording/Deck.h
index 1f8d58d5e1..6dce3a445b 100644
--- a/libraries/recording/src/recording/Deck.h
+++ b/libraries/recording/src/recording/Deck.h
@@ -57,6 +57,9 @@ public:
     float position() const;
     void seek(float position);
 
+    float getVolume() const { return _volume; }
+    void setVolume(float volume);
+
 signals:
     void playbackStateChanged();
     void looped();
@@ -76,6 +79,7 @@ private:
     bool _pause { true };
     bool _loop { false };
     float _length { 0 };
+    float _volume { 1.0f };
 };
 
 }
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index bf528ee5f0..c4020cb4c4 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -393,7 +393,7 @@ void AnimDebugDraw::update() {
             glm::quat rot = std::get<0>(iter.second);
             glm::vec3 pos = std::get<1>(iter.second);
             glm::vec4 color = std::get<2>(iter.second);
-            const float radius = POSE_RADIUS;
+            const float radius = std::get<3>(iter.second) * POSE_RADIUS;
             addBone(AnimPose::identity, AnimPose(glm::vec3(1), rot, pos), radius, color, v);
         }
 
@@ -402,7 +402,7 @@ void AnimDebugDraw::update() {
             glm::quat rot = std::get<0>(iter.second);
             glm::vec3 pos = std::get<1>(iter.second);
             glm::vec4 color = std::get<2>(iter.second);
-            const float radius = POSE_RADIUS;
+            const float radius = std::get<3>(iter.second) * POSE_RADIUS;
             addBone(myAvatarPose, AnimPose(glm::vec3(1), rot, pos), radius, color, v);
         }
 
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 180e914d60..c9da8373db 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -139,6 +139,11 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
 }
 #else
 
+void AntialiasingConfig::setAAMode(int mode) {
+    _mode = std::min((int)AntialiasingConfig::MODE_COUNT, std::max(0, mode));
+    emit dirty();
+}
+
 Antialiasing::Antialiasing(bool isSharpenEnabled) : 
     _isSharpenEnabled{ isSharpenEnabled } {
 }
@@ -189,6 +194,8 @@ const gpu::PipelinePointer& Antialiasing::getDebugBlendPipeline() {
 }
 
 void Antialiasing::configure(const Config& config) {
+    _mode = (AntialiasingConfig::Mode) config.getAAMode();
+
     _sharpen = config.sharpen * 0.25f;
     if (!_isSharpenEnabled) {
         _sharpen = 0.0f;
@@ -298,29 +305,33 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
     });
 }
 
-
 void JitterSampleConfig::setIndex(int current) {
     _index = (current) % JitterSample::SEQUENCE_LENGTH;    
     emit dirty();
 }
 
-int JitterSampleConfig::cycleStopPauseRun() {
-    _state = (_state + 1) % 3;
+void JitterSampleConfig::setState(int state) {
+    _state = (state) % 3;
     switch (_state) {
-        case 0: {
-            return none();
-            break;
-        }
-        case 1: {
-            return pause();
-            break;
-        }
-        case 2:
-        default: {
-            return play();
-            break;
-        }
+    case 0: {
+        none();
+        break;
     }
+    case 1: {
+        pause();
+        break;
+    }
+    case 2:
+    default: {
+        play();
+        break;
+    }
+    }
+    emit dirty();
+}
+
+int JitterSampleConfig::cycleStopPauseRun() {
+    setState((_state + 1) % 3);
     return _state;
 }
 
diff --git a/libraries/render-utils/src/AntialiasingEffect.h b/libraries/render-utils/src/AntialiasingEffect.h
index 7d8bbb44d9..fc25343751 100644
--- a/libraries/render-utils/src/AntialiasingEffect.h
+++ b/libraries/render-utils/src/AntialiasingEffect.h
@@ -25,6 +25,7 @@ class JitterSampleConfig : public render::Job::Config {
         Q_PROPERTY(bool freeze MEMBER freeze NOTIFY dirty)
         Q_PROPERTY(bool stop MEMBER stop NOTIFY dirty)
         Q_PROPERTY(int index READ getIndex NOTIFY dirty)
+        Q_PROPERTY(int state READ getState WRITE setState NOTIFY dirty)
 public:
     JitterSampleConfig() : render::Job::Config(true) {}
 
@@ -33,6 +34,7 @@ public:
     bool freeze{ false };
 
     void setIndex(int current);
+    void setState(int state);
 
 public slots:
     int cycleStopPauseRun();
@@ -86,6 +88,7 @@ private:
 
 class AntialiasingConfig : public render::Job::Config {
     Q_OBJECT
+    Q_PROPERTY(int mode READ getAAMode WRITE setAAMode NOTIFY dirty)
     Q_PROPERTY(float blend MEMBER blend NOTIFY dirty)
     Q_PROPERTY(float sharpen MEMBER sharpen NOTIFY dirty)
     Q_PROPERTY(float covarianceGamma MEMBER covarianceGamma NOTIFY dirty)
@@ -106,9 +109,21 @@ class AntialiasingConfig : public render::Job::Config {
 public:
     AntialiasingConfig() : render::Job::Config(true) {}
 
+    enum Mode {
+        OFF = 0,
+        TAA,
+        FXAA,
+        MODE_COUNT
+    };
+
+    void setAAMode(int mode);
+    int getAAMode() const { return _mode; }
+
     void setDebugFXAA(bool debug) { debugFXAAX = (debug ? 0.0f : 1.0f); emit dirty();}
     bool debugFXAA() const { return (debugFXAAX == 0.0f ? true : false); }
 
+    int _mode{ TAA };
+
     float blend{ 0.25f };
     float sharpen{ 0.05f };
 
@@ -195,6 +210,7 @@ private:
     gpu::PipelinePointer _debugBlendPipeline;
 
     TAAParamsBuffer _params;
+    AntialiasingConfig::Mode _mode{ AntialiasingConfig::TAA };
     float _sharpen{ 0.15f };
     bool _isSharpenEnabled{ true };
 };
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index e58d07ac33..0c499a9d34 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -35,12 +35,13 @@ void BloomThreshold::run(const render::RenderContextPointer& renderContext, cons
     const auto frameTransform = inputs.get0();
     const auto inputFrameBuffer = inputs.get1();
     const auto bloomFrame = inputs.get2();
+    const auto lightingModel = inputs.get3();
     const auto& bloomStage = renderContext->_scene->getStage<BloomStage>();
     graphics::BloomPointer bloom;
     if (bloomStage && bloomFrame->_blooms.size()) {
         bloom = bloomStage->getBloom(bloomFrame->_blooms.front());
     }
-    if (!bloom) {
+    if (!bloom || (lightingModel && !lightingModel->isBloomEnabled())) {
         renderContext->taskFlow.abortTask();
         return;
     }
@@ -187,12 +188,17 @@ void BloomDraw::run(const render::RenderContextPointer& renderContext, const Inp
     }
 }
 
+void DebugBloomConfig::setMode(int mode) {
+    _mode = std::min((int)DebugBloomConfig::MODE_COUNT, std::max(0, mode));
+    emit dirty();
+}
+
 DebugBloom::DebugBloom() {
     _params = std::make_shared<gpu::Buffer>(sizeof(glm::vec4), nullptr);
 }
 
 void DebugBloom::configure(const Config& config) {
-    _mode = static_cast<DebugBloomConfig::Mode>(config.mode);
+    _mode = (DebugBloomConfig::Mode) config.getMode();
     assert(_mode < DebugBloomConfig::MODE_COUNT);
 }
 
@@ -201,6 +207,10 @@ void DebugBloom::run(const render::RenderContextPointer& renderContext, const In
     assert(renderContext->args->hasViewFrustum());
     RenderArgs* args = renderContext->args;
 
+    if (_mode == DebugBloomConfig::OFF) {
+        return;
+    }
+
     const auto frameBuffer = inputs.get0();
     const auto combinedBlurBuffer = inputs.get4();
     const auto framebufferSize = frameBuffer->getSize();
diff --git a/libraries/render-utils/src/BloomEffect.h b/libraries/render-utils/src/BloomEffect.h
index 07ae2887c9..47558affd9 100644
--- a/libraries/render-utils/src/BloomEffect.h
+++ b/libraries/render-utils/src/BloomEffect.h
@@ -17,6 +17,7 @@
 #include "BloomStage.h"
 
 #include "DeferredFrameTransform.h"
+#include "LightingModel.h"
 
 class BloomConfig : public render::Task::Config {
     Q_OBJECT
@@ -28,7 +29,7 @@ class BloomThresholdConfig : public render::Job::Config {
 
 class BloomThreshold {
 public:
-    using Inputs = render::VaryingSet3<DeferredFrameTransformPointer, gpu::FramebufferPointer, BloomStage::FramePointer>;
+    using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, gpu::FramebufferPointer, BloomStage::FramePointer, LightingModelPointer>;
     using Outputs = render::VaryingSet3<gpu::FramebufferPointer, float, graphics::BloomPointer>;
     using Config = BloomThresholdConfig;
     using JobModel = render::Job::ModelIO<BloomThreshold, Inputs, Outputs, Config>;
@@ -87,12 +88,13 @@ private:
 
 class DebugBloomConfig : public render::Job::Config {
     Q_OBJECT
-    Q_PROPERTY(int mode MEMBER mode NOTIFY dirty)
+    Q_PROPERTY(int mode READ getMode WRITE setMode NOTIFY dirty)
 
 public:
 
     enum Mode {
-        MODE_LEVEL0 = 0,
+        OFF = 0,
+        MODE_LEVEL0,
         MODE_LEVEL1,
         MODE_LEVEL2,
         MODE_ALL_LEVELS,
@@ -102,7 +104,10 @@ public:
 
     DebugBloomConfig() : render::Job::Config(false) {}
 
-    int mode{ MODE_ALL_LEVELS };
+    void setMode(int mode);
+    int getMode() const { return _mode; }
+
+    int _mode{ MODE_ALL_LEVELS };
 
 signals:
     void dirty();
@@ -127,14 +132,14 @@ private:
 
 class BloomEffect {
 public:
-    using Inputs = render::VaryingSet3<DeferredFrameTransformPointer, gpu::FramebufferPointer, BloomStage::FramePointer>;
+    using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, gpu::FramebufferPointer, BloomStage::FramePointer, LightingModelPointer>;
     using Config = BloomConfig;
-	using JobModel = render::Task::ModelI<BloomEffect, Inputs, Config>;
+    using JobModel = render::Task::ModelI<BloomEffect, Inputs, Config>;
 
-	BloomEffect();
+    BloomEffect();
 
-	void configure(const Config& config);
-	void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
+    void configure(const Config& config);
+    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
 
 };
 
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 4561cf903d..c506f22bc7 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -150,8 +150,6 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     // Prepare deferred, generate the shared Deferred Frame Transform. Only valid with the scaled frame buffer
     const auto deferredFrameTransform = task.addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform", jitter);
 
-    const auto opaqueRangeTimer = task.addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer", "DrawOpaques");
-
     const auto prepareDeferredInputs = PrepareDeferred::Inputs(scaledPrimaryFramebuffer, lightingModel).asVarying();
     const auto prepareDeferredOutputs = task.addJob<PrepareDeferred>("PrepareDeferred", prepareDeferredInputs);
     const auto deferredFramebuffer = prepareDeferredOutputs.getN<PrepareDeferred::Outputs>(0);
@@ -164,8 +162,6 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     const auto opaqueInputs = DrawStateSortDeferred::Inputs(opaques, lightingModel, jitter).asVarying();
     task.addJob<DrawStateSortDeferred>("DrawOpaqueDeferred", opaqueInputs, shapePlumber);
 
-    task.addJob<EndGPURangeTimer>("OpaqueRangeTimer", opaqueRangeTimer);
-
     // Opaque all rendered
 
     // Linear Depth Pass
@@ -216,13 +212,10 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     const auto transparentsInputs = RenderTransparentDeferred::Inputs(transparents, hazeFrame, lightFrame, lightingModel, lightClusters, shadowFrame, jitter).asVarying();
     task.addJob<RenderTransparentDeferred>("DrawTransparentDeferred", transparentsInputs, shapePlumber);
 
-    const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginHighlightRangeTimer", "Highlight");
-
+    // Highlight 
     const auto outlineInputs = DrawHighlightTask::Inputs(items, deferredFramebuffer, lightingFramebuffer, deferredFrameTransform, jitter).asVarying();
     task.addJob<DrawHighlightTask>("DrawHighlight", outlineInputs);
 
-    task.addJob<EndGPURangeTimer>("HighlightRangeTimer", outlineRangeTimer);
-
     // Layered Over (in front)
     const auto inFrontOpaquesInputs = DrawLayered3D::Inputs(inFrontOpaque, lightingModel, hazeFrame, jitter).asVarying();
     const auto inFrontTransparentsInputs = DrawLayered3D::Inputs(inFrontTransparent, lightingModel, hazeFrame, jitter).asVarying();
@@ -234,7 +227,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     task.addJob<Antialiasing>("Antialiasing", antialiasingInputs);
 
     // Add bloom
-    const auto bloomInputs = BloomEffect::Inputs(deferredFrameTransform, lightingFramebuffer, bloomFrame).asVarying();
+    const auto bloomInputs = BloomEffect::Inputs(deferredFrameTransform, lightingFramebuffer, bloomFrame, lightingModel).asVarying();
     task.addJob<BloomEffect>("Bloom", bloomInputs);
 
     const auto destFramebuffer = static_cast<gpu::FramebufferPointer>(nullptr);
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index d0ebe167f9..518e43a8ec 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -461,6 +461,13 @@ void RenderPipelines::updateMultiMaterial(graphics::MultiMaterial& multiMaterial
                         wasSet = true;
                     }
                     break;
+                case graphics::MaterialKey::OPACITY_CUTOFF_VAL_BIT:
+                    if (materialKey.isOpacityCutoff()) {
+                        schema._opacityCutoff = material->getOpacityCutoff();
+                        schemaKey.setOpacityCutoff(true);
+                        wasSet = true;
+                    }
+                    break;
                 case graphics::MaterialKey::SCATTERING_VAL_BIT:
                     if (materialKey.isScattering()) {
                         schema._scattering = material->getScattering();
@@ -752,7 +759,7 @@ bool RenderPipelines::bindMaterials(graphics::MultiMaterial& multiMaterial, gpu:
 
     // For shadows, we only need opacity mask information
     auto key = multiMaterial.getMaterialKey();
-    if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE || key.isOpacityMaskMap()) {
+    if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE || (key.isOpacityMaskMap() || key.isTranslucentMap())) {
         auto& schemaBuffer = multiMaterial.getSchemaBuffer();
         batch.setUniformBuffer(gr::Buffer::Material, schemaBuffer);
         if (enableTextures) {
diff --git a/libraries/render-utils/src/model.slf b/libraries/render-utils/src/model.slf
index 3e4711dac8..bacc6b0ab1 100644
--- a/libraries/render-utils/src/model.slf
+++ b/libraries/render-utils/src/model.slf
@@ -103,14 +103,14 @@ void main(void) {
         <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex)$>
 
     <@if HIFI_USE_TRANSLUCENT@>
+        float cutoff = getMaterialOpacityCutoff(mat);
         float opacity = getMaterialOpacity(mat) * _color.a;
-    <@else@>
-        float opacity = 1.0;
-    <@endif@>
-        <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
-    <@if HIFI_USE_TRANSLUCENT@>
+        <$evalMaterialOpacity(albedoTex.a, cutoff, opacity, matKey, opacity)$>;
         <$discardInvisible(opacity)$>;
     <@else@>
+        float cutoff = getMaterialOpacityCutoff(mat);
+        float opacity = 1.0;
+        <$evalMaterialOpacityMask(albedoTex.a, cutoff, opacity)$>;
         <$discardTransparent(opacity)$>;
     <@endif@>
 
@@ -155,15 +155,15 @@ void main(void) {
     <@endif@>
 
     <@if HIFI_USE_TRANSLUCENT@>
+        float cutoff = getMaterialOpacityCutoff(mat);
         float opacity = getMaterialOpacity(mat) * _color.a;
+        <$evalMaterialOpacity(albedoTex.a, cutoff, opacity, matKey, opacity)$>;
+        <$discardInvisible(opacity)$>;
     <@else@>
+        float cutoff = getMaterialOpacityCutoff(mat);
         float opacity = 1.0;
-    <@endif@>
-        <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
-    <@if HIFI_USE_TRANSLUCENT@>
-            <$discardInvisible(opacity)$>;
-    <@else@>
-            <$discardTransparent(opacity)$>;
+        <$evalMaterialOpacityMask(albedoTex.a, cutoff, opacity)$>;
+        <$discardTransparent(opacity)$>;
     <@endif@>
 
         vec3 albedo = getMaterialAlbedo(mat);
@@ -217,13 +217,13 @@ void main(void) {
                 _fragColor0 = color;
             <@else@>
                 _fragColor0 = vec4(evalLightmappedColor(
-		            cam._viewInverse,
-		            1.0,
-		            DEFAULT_OCCLUSION,
-		            fragNormalWS,
-		            albedo,
-		            lightmap),
-		            opacity);
+                    cam._viewInverse,
+                    1.0,
+                    DEFAULT_OCCLUSION,
+                    fragNormalWS,
+                    albedo,
+                    lightmap),
+                    opacity);
             <@endif@>
         <@else@>
             <@if not HIFI_USE_LIGHTMAP@>
@@ -241,13 +241,13 @@ void main(void) {
                     opacity);
             <@else@>
                 _fragColor0 = vec4(evalLightmappedColor(
-		            cam._viewInverse,
-		            1.0,
-		            DEFAULT_OCCLUSION,
-		            fragNormalWS,
-		            albedo,
-		            lightmap),
-		            opacity);
+                cam._viewInverse,
+                1.0,
+                DEFAULT_OCCLUSION,
+                fragNormalWS,
+                albedo,
+                lightmap),
+                opacity);
             <@endif@>
         <@endif@>
     <@else@>
@@ -315,13 +315,13 @@ void main(void) {
                     opacity);
             <@else@>
                 _fragColor0 = vec4(evalLightmappedColor(
-		            cam._viewInverse,
-		            1.0,
-		            DEFAULT_OCCLUSION,
-		            fragNormalWS,
-		            albedo,
-		            lightmap),
-		            opacity);
+                    cam._viewInverse,
+                    1.0,
+                    DEFAULT_OCCLUSION,
+                    fragNormalWS,
+                    albedo,
+                    lightmap),
+                    opacity);
             <@endif@>
         <@endif@>
     <@endif@>
diff --git a/libraries/render/src/render/EngineStats.cpp b/libraries/render/src/render/EngineStats.cpp
index ae1467ac0f..6fbd3e6f9c 100644
--- a/libraries/render/src/render/EngineStats.cpp
+++ b/libraries/render/src/render/EngineStats.cpp
@@ -63,4 +63,6 @@ void EngineStats::run(const RenderContextPointer& renderContext) {
 
     config->frameSetPipelineCount = _gpuStats._PSNumSetPipelines;
     config->frameSetInputFormatCount = _gpuStats._ISNumFormatChanges;
+
+    // These new stat values are notified with the "newStats" signal triggered by the timer
 }
diff --git a/libraries/render/src/render/EngineStats.h b/libraries/render/src/render/EngineStats.h
index 3ccbd40715..9f8be748f7 100644
--- a/libraries/render/src/render/EngineStats.h
+++ b/libraries/render/src/render/EngineStats.h
@@ -24,42 +24,42 @@ namespace render {
     class EngineStatsConfig : public Job::Config{
         Q_OBJECT
 
-        Q_PROPERTY(quint32 bufferCPUCount MEMBER bufferCPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 bufferGPUCount MEMBER bufferGPUCount NOTIFY dirty)
-        Q_PROPERTY(qint64 bufferCPUMemSize MEMBER bufferCPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 bufferGPUMemSize MEMBER bufferGPUMemSize NOTIFY dirty)
+        Q_PROPERTY(quint32 bufferCPUCount MEMBER bufferCPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 bufferGPUCount MEMBER bufferGPUCount NOTIFY newStats)
+        Q_PROPERTY(qint64 bufferCPUMemSize MEMBER bufferCPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 bufferGPUMemSize MEMBER bufferGPUMemSize NOTIFY newStats)
 
-        Q_PROPERTY(quint32 textureCPUCount MEMBER textureCPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 textureGPUCount MEMBER textureGPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 textureResidentGPUCount MEMBER textureResidentGPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 textureFramebufferGPUCount MEMBER textureFramebufferGPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 textureResourceGPUCount MEMBER textureResourceGPUCount NOTIFY dirty)
-        Q_PROPERTY(quint32 textureExternalGPUCount MEMBER textureExternalGPUCount NOTIFY dirty)
+        Q_PROPERTY(quint32 textureCPUCount MEMBER textureCPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 textureGPUCount MEMBER textureGPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 textureResidentGPUCount MEMBER textureResidentGPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 textureFramebufferGPUCount MEMBER textureFramebufferGPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 textureResourceGPUCount MEMBER textureResourceGPUCount NOTIFY newStats)
+        Q_PROPERTY(quint32 textureExternalGPUCount MEMBER textureExternalGPUCount NOTIFY newStats)
 
-        Q_PROPERTY(qint64 textureCPUMemSize MEMBER textureCPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureGPUMemSize MEMBER textureGPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureResidentGPUMemSize MEMBER textureResidentGPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureFramebufferGPUMemSize MEMBER textureFramebufferGPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureResourceGPUMemSize MEMBER textureResourceGPUMemSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureExternalGPUMemSize MEMBER textureExternalGPUMemSize NOTIFY dirty)
+        Q_PROPERTY(qint64 textureCPUMemSize MEMBER textureCPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureGPUMemSize MEMBER textureGPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureResidentGPUMemSize MEMBER textureResidentGPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureFramebufferGPUMemSize MEMBER textureFramebufferGPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureResourceGPUMemSize MEMBER textureResourceGPUMemSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureExternalGPUMemSize MEMBER textureExternalGPUMemSize NOTIFY newStats)
 
-        Q_PROPERTY(quint32 texturePendingGPUTransferCount MEMBER texturePendingGPUTransferCount NOTIFY dirty)
-        Q_PROPERTY(qint64 texturePendingGPUTransferSize MEMBER texturePendingGPUTransferSize NOTIFY dirty)
-        Q_PROPERTY(qint64 textureResourcePopulatedGPUMemSize MEMBER textureResourcePopulatedGPUMemSize NOTIFY dirty)
+        Q_PROPERTY(quint32 texturePendingGPUTransferCount MEMBER texturePendingGPUTransferCount NOTIFY newStats)
+        Q_PROPERTY(qint64 texturePendingGPUTransferSize MEMBER texturePendingGPUTransferSize NOTIFY newStats)
+        Q_PROPERTY(qint64 textureResourcePopulatedGPUMemSize MEMBER textureResourcePopulatedGPUMemSize NOTIFY newStats)
 
-        Q_PROPERTY(quint32 frameAPIDrawcallCount MEMBER frameAPIDrawcallCount NOTIFY dirty)
-        Q_PROPERTY(quint32 frameDrawcallCount MEMBER frameDrawcallCount NOTIFY dirty)
-        Q_PROPERTY(quint32 frameDrawcallRate MEMBER frameDrawcallRate NOTIFY dirty)
+        Q_PROPERTY(quint32 frameAPIDrawcallCount MEMBER frameAPIDrawcallCount NOTIFY newStats)
+        Q_PROPERTY(quint32 frameDrawcallCount MEMBER frameDrawcallCount NOTIFY newStats)
+        Q_PROPERTY(quint32 frameDrawcallRate MEMBER frameDrawcallRate NOTIFY newStats)
 
-        Q_PROPERTY(quint32 frameTriangleCount MEMBER frameTriangleCount NOTIFY dirty)
-        Q_PROPERTY(quint32 frameTriangleRate MEMBER frameTriangleRate NOTIFY dirty)
+        Q_PROPERTY(quint32 frameTriangleCount MEMBER frameTriangleCount NOTIFY newStats)
+        Q_PROPERTY(quint32 frameTriangleRate MEMBER frameTriangleRate NOTIFY newStats)
 
-        Q_PROPERTY(quint32 frameTextureCount MEMBER frameTextureCount NOTIFY dirty)
-        Q_PROPERTY(quint32 frameTextureRate MEMBER frameTextureRate NOTIFY dirty)
-        Q_PROPERTY(quint64 frameTextureMemoryUsage MEMBER frameTextureMemoryUsage NOTIFY dirty)
+        Q_PROPERTY(quint32 frameTextureCount MEMBER frameTextureCount NOTIFY newStats)
+        Q_PROPERTY(quint32 frameTextureRate MEMBER frameTextureRate NOTIFY newStats)
+        Q_PROPERTY(quint64 frameTextureMemoryUsage MEMBER frameTextureMemoryUsage NOTIFY newStats)
 
-        Q_PROPERTY(quint32 frameSetPipelineCount MEMBER frameSetPipelineCount NOTIFY dirty)
-        Q_PROPERTY(quint32 frameSetInputFormatCount MEMBER frameSetInputFormatCount NOTIFY dirty)
+        Q_PROPERTY(quint32 frameSetPipelineCount MEMBER frameSetPipelineCount NOTIFY newStats)
+        Q_PROPERTY(quint32 frameSetInputFormatCount MEMBER frameSetInputFormatCount NOTIFY newStats)
 
 
     public:
@@ -101,13 +101,6 @@ namespace render {
         quint32 frameSetPipelineCount{ 0 };
 
         quint32 frameSetInputFormatCount{ 0 };
-
-
-
-        void emitDirty() { emit dirty(); }
-
-    signals:
-        void dirty();
     };
 
     class EngineStats {
diff --git a/libraries/script-engine/src/AbstractScriptingServicesInterface.h b/libraries/script-engine/src/AbstractScriptingServicesInterface.h
index e7a8d11562..ac26b166b6 100644
--- a/libraries/script-engine/src/AbstractScriptingServicesInterface.h
+++ b/libraries/script-engine/src/AbstractScriptingServicesInterface.h
@@ -18,7 +18,7 @@
 class AbstractScriptingServicesInterface {
 public:
     /// Registers application specific services with a script engine.
-    virtual void registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) = 0;
+    virtual void registerScriptEngineWithApplicationServices(const ScriptEnginePointer& scriptEngine) = 0;
 };
 
 
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index e389bd8446..54b570e256 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -81,6 +81,11 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
     setMappingRequest->start();
 }
 
+/**jsdoc
+ * The success or failure of an {@link Assets.downloadData} call.
+ * @typedef {object} Assets.DownloadDataError
+ * @property {string} errorMessage - <code>""</code> if the download was successful, otherwise a description of the error.
+ */
 void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {
     // FIXME: historically this API method failed silently when given a non-atp prefixed
     //   urlString (or if the AssetRequest failed).
@@ -127,6 +132,9 @@ void AssetScriptingInterface::setBakingEnabled(QString path, bool enabled, QScri
     auto setBakingEnabledRequest = DependencyManager::get<AssetClient>()->createSetBakingEnabledRequest({ path }, enabled);
 
     Promise deferred = jsPromiseReady(makePromise(__FUNCTION__), thisObject(), callback);
+    if (!deferred) {
+        return;
+    }
 
     connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, setBakingEnabledRequest, [deferred](SetBakingEnabledRequest* request) {
         Q_ASSERT(QThread::currentThread() == request->thread());
@@ -216,20 +224,31 @@ void AssetScriptingInterface::deleteAsset(QScriptValue options, QScriptValue sco
 }
 
 /**jsdoc
- * @typedef {string} Assets.GetOptions.ResponseType
- * <p>Available <code>responseType</code> values for use with @{link Assets.getAsset} and @{link Assets.loadFromCache} configuration option. </p>
- * <table>
- *   <thead>
- *     <tr><th>responseType</th><th>typeof response value</th></tr>
- *   </thead>
- *   <tbody>
- *     <tr><td><code>"text"</code></td><td>contents returned as utf-8 decoded <code>String</code> value</td></tr>
- *     <tr><td><code>"arraybuffer"</code></td><td>contents as a binary <code>ArrayBuffer</code> object</td></tr>
- *     <tr><td><code>"json"</code></td><td>contents as a parsed <code>JSON</code> object</td></tr>
- *   </tbody>
- * </table>
+ * Source and download options for {@link Assets.getAsset}.
+ * @typedef {object} Assets.GetOptions
+ * @property {boolean} [decompress=false] - <code>true</code> to gunzip decompress the downloaded data. Synonym:
+ *     <code>compressed</code>.
+ * @property {Assets.ResponseType} [responseType="text"] - The desired result type.
+ * @property {string} url - The mapped path or hash to download. May have a leading <code>"atp:"</code>.
+ */
+/**jsdoc
+ * Result value returned by {@link Assets.getAsset}. 
+ * @typedef {object} Assets.GetResult
+ * @property {number} [byteLength] - The number of bytes in the downloaded content in <code>response</code>.
+ * @property {boolean} cached - <code>true</code> if the item was retrieved from the cache, <code>false</code> if it was 
+ *     downloaded.
+ * @property {string} [contentType] - The automatically detected MIME type of the content.
+ * @property {boolean} [decompressed] - <code>true</code> if the content was decompressed, <code>false</code> if it wasn't.
+ * @property {string} [hash] - The hash for the downloaded asset.
+ * @property {string} [hashURL] - The ATP URL of the hash file.
+ * @property {string} [path] - The path for the asset, if a path was requested. Otherwise, <code>undefined</code>.
+ * @property {string|object|ArrayBuffer} [response] - The downloaded content.
+ * @property {Assets.ResponseType} [responseType] - The type of the downloaded content in <code>response</code>.
+ * @property {string} [url] - The URL of the asset requested: the path with leading <code>"atp:"</code> if a path was 
+ *     requested, otherwise the requested URL.
+ * @property {boolean} [wasRedirected] - <code>true</code> if the downloaded data is the baked version of the asset, 
+ *      <code>false</code> if it isn't baked.
  */
-
 void AssetScriptingInterface::getAsset(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     JS_VERIFY(options.isObject() || options.isString(), "expected request options Object or URL as first parameter");
 
@@ -249,8 +268,11 @@ void AssetScriptingInterface::getAsset(QScriptValue options, QScriptValue scope,
               QString("Invalid responseType: '%1' (expected: %2)").arg(responseType).arg(RESPONSE_TYPES.join(" | ")));
 
     Promise fetched = jsPromiseReady(makePromise("fetched"), scope, callback);
-    Promise mapped = makePromise("mapped");
+    if (!fetched) {
+        return;
+    }
 
+    Promise mapped = makePromise("mapped");
     mapped->fail(fetched);
     mapped->then([=](QVariantMap result) {
         QString hash = result.value("hash").toString();
@@ -277,6 +299,22 @@ void AssetScriptingInterface::getAsset(QScriptValue options, QScriptValue scope,
     }
 }
 
+/**jsdoc
+ * Source options for {@link Assets.resolveAsset}.
+ * @typedef {object} Assets.ResolveOptions
+ * @property {string} url - The hash or path to resolve. May have a leading <code>"atp:"</code>.
+ */
+/**jsdoc
+ * Result value returned by {@link Assets.resolveAsset}.
+ * <p>Note: If resolving a hash, a file of that hash need not be present on the asset server for the hash to resolve.</p>
+ * @typedef {object} Assets.ResolveResult
+ * @property {string} [hash] - The hash of the asset.
+ * @property {string} [hashURL] - The url of the asset's hash file, with leading <code>atp:</code>. 
+ * @property {string} [path] - The path to the asset.
+ * @property {string} [url] - The URL of the asset.
+ * @property {boolean} [wasRedirected] - <code>true</code> if the resolved data is for the baked version of the asset,
+ *      <code>false</code> if it isn't.
+ */
 void AssetScriptingInterface::resolveAsset(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     const QString& URL{ "url" };
 
@@ -289,6 +327,21 @@ void AssetScriptingInterface::resolveAsset(QScriptValue options, QScriptValue sc
     jsPromiseReady(getAssetInfo(asset), scope, callback);
 }
 
+/**jsdoc
+ * Content and decompression options for {@link Assets.decompressData}.
+ * @typedef {object} Assets.DecompressOptions
+ * @property {ArrayBuffer} data - The data to decompress.
+ * @property {Assets.ResponseType} [responseType=text] - The type of decompressed data to return.
+ */
+/**jsdoc
+ * Result value returned by {@link Assets.decompressData}.
+ * @typedef {object} Assets.DecompressResult
+ * @property {number} [byteLength] - The number of bytes in the decompressed data.
+ * @property {string} [contentType] - The MIME type of the decompressed data.
+ * @property {boolean} [decompressed] - <code>true</code> if the data is decompressed.
+ * @property {string|object|ArrayBuffer} [response] - The decompressed data.
+ * @property {Assets.ResponseType} [responseType] - The type of the decompressed data in <code>response</code>.
+ */
 void AssetScriptingInterface::decompressData(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     auto data = options.property("data");
     QByteArray dataByteArray = qscriptvalue_cast<QByteArray>(data);
@@ -313,6 +366,23 @@ namespace {
     const int32_t DEFAULT_GZIP_COMPRESSION_LEVEL = -1;
     const int32_t MAX_GZIP_COMPRESSION_LEVEL = 9;
 }
+
+/**jsdoc
+ * Content and compression options for {@link Assets.compressData}.
+ * @typedef {object} Assets.CompressOptions
+ * @property {string|ArrayBuffer} data - The data to compress.
+ * @property {number} level - The compression level, range <code>-1</code> &ndash; <code>9</code>. <code>-1</code> means 
+ *     use the default gzip compression level, <code>0</code> means no compression, and <code>9</code> means maximum 
+ *     compression.
+ */
+/**jsdoc
+ * Result value returned by {@link Assets.compressData}.
+ * @typedef {object} Assets.CompressResult
+ * @property {number} [byteLength] - The number of bytes in the compressed data.
+ * @property {boolean} [compressed] - <code>true</code> if the data is compressed.
+ * @property {string} [contentType] - The MIME type of the compressed data, i.e., <code>"application/gzip"</code>.
+ * @property {ArrayBuffer} [data] - The compressed data.
+ */
 void AssetScriptingInterface::compressData(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     auto data = options.property("data").isValid() ? options.property("data") : options;
     QByteArray dataByteArray = data.isString() ? data.toString().toUtf8() : qscriptvalue_cast<QByteArray>(data);
@@ -321,6 +391,27 @@ void AssetScriptingInterface::compressData(QScriptValue options, QScriptValue sc
     jsPromiseReady(compressBytes(dataByteArray, level), scope, callback);
 }
 
+/**jsdoc
+ * Content and upload options for {@link Assets.putAsset}.
+ * @typedef {object} Assets.PutOptions
+ * @property {boolean} [compress=false] - <code>true</code> to gzip compress the content for upload and storage,
+ *     <code>false</code> to upload and store the data without gzip compression. Synonym: <code>compressed</code>.
+ * @property {string|ArrayBuffer} data - The content to upload.
+ * @property {string} [path] - A user-friendly path for the file in the asset server. May have a leading 
+ *     <code>"atp:"</code>. IF not specified, no path-to-hash mapping is set.
+ *     <p>Note: The asset server destroys any unmapped SHA256-named file at server restart. Either set the mapping path 
+ *     with this property or use {@link Assets.setMapping} to set a path-to-hash mapping for the uploaded file.</p>
+ */
+/**jsdoc
+ * Result value returned by {@link Assets.putAsset}.
+ * @typedef {object} Assets.PutResult
+ * @property {number} [byteLength] - The number of bytes in the hash file stored on the asset server.
+ * @property {boolean} [compressed] - <code>true</code> if the content stored is gzip compressed.
+ * @property {string} [contentType] - <code>"application/gzip"</code> if the content stored is gzip compressed.
+ * @property {string} [hash] - The SHA256 hash of the content.
+ * @property {string} [url] - The <code>atp:</code> URL of the content: using the path if specified, otherwise the hash.
+ * @property {string} [path] - The uploaded content's mapped path, if specified.
+ */
 void AssetScriptingInterface::putAsset(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     auto compress = options.property("compress").toBool() || options.property("compressed").toBool();
     auto data = options.isObject() ? options.property("data") : options;
@@ -371,12 +462,27 @@ void AssetScriptingInterface::putAsset(QScriptValue options, QScriptValue scope,
     }
 }
 
+/**jsdoc
+ * Source for {@link Assets.queryCacheMeta}.
+ * @typedef {object} Assets.QueryCacheMetaOptions
+ * @property {string} url - The URL of the cached asset to get information on. Must start with <code>"atp:"</code> or 
+ *     <code>"cache:"</code>.
+ */
 void AssetScriptingInterface::queryCacheMeta(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     QString url = options.isString() ? options.toString() : options.property("url").toString();
     JS_VERIFY(QUrl(url).isValid(), QString("Invalid URL '%1'").arg(url));
     jsPromiseReady(Parent::queryCacheMeta(url), scope, callback);
 }
 
+/**jsdoc
+ * Source and retrieval options for {@link Assets.loadFromCache}.
+ * @typedef {object} Assets.LoadFromCacheOptions
+ * @property {boolean} [decompress=false] - <code>true</code> to gunzip decompress the cached data. Synonym:
+ *     <code>compressed</code>.
+ * @property {Assets.ResponseType} [responseType=text] - The desired result type.
+ * @property {string} url - The URL of the asset to load from cache. Must start with <code>"atp:"</code> or
+ *     <code>"cache:"</code>.
+ */
 void AssetScriptingInterface::loadFromCache(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     QString url, responseType;
     bool decompress = false;
@@ -411,6 +517,14 @@ bool AssetScriptingInterface::canWriteCacheValue(const QUrl& url) {
     return true;
 }
 
+/**jsdoc
+ * The data to save to the cache and cache options for {@link Assets.saveToCache}.
+ * @typedef {object} Assets.SaveToCacheOptions
+ * @property {string|ArrayBuffer} data - The data to save to the cache.
+ * @property {Assets.SaveToCacheHeaders} [headers] - The last-modified and expiry times for the cache item.
+ * @property {string} [url] - The URL to associate with the cache item. Must start with <code>"atp:"</code> or
+ *     <code>"cache:"</code>. If not specified, the URL is <code>"atp:"</code> followed by the SHA256 hash of the content.
+ */
 void AssetScriptingInterface::saveToCache(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     JS_VERIFY(options.isObject(), QString("expected options object as first parameter not: %1").arg(options.toVariant().typeName()));
 
diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h
index 07d681ca88..5da3c51a08 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@@ -25,7 +25,14 @@
 #include <QtNetwork/QNetworkDiskCache>
 
 /**jsdoc
- * The Assets API allows you to communicate with the Asset Browser.
+ * The <code>Assets</code> API provides facilities for interacting with the domain's asset server and the client cache. 
+ * <p>Assets are stored in the asset server in files with SHA256 names. These files are mapped to user-friendly URLs of the 
+ * format: <code>atp:/path/filename</code>. The assets may optionally be baked, in which case a request for the original 
+ * unbaked version of the asset is automatically redirected to the baked version. The asset data may optionally be stored as 
+ * compressed.</p>
+ * <p>The client cache can be access directly, using <code>"atp:"</code> or <code>"cache:"</code> URLs. Interface, avatar, and 
+ * assignment client scripts can write to the cache. All script types can read from the cache.</p>
+ *
  * @namespace Assets
  *
  * @hifi-interface
@@ -41,251 +48,490 @@ public:
     AssetScriptingInterface(QObject* parent = nullptr);
 
     /**jsdoc
-     * Upload content to the connected domain's asset server.
-     * @function Assets.uploadData
-     * @static
-     * @param data {string} content to upload
-     * @param callback {Assets~uploadDataCallback} called when upload is complete
+     * Called when an {@link Assets.uploadData} call is complete.
+     * @callback Assets~uploadDataCallback
+     * @param {string} url - The raw URL of the file that the content is stored in, with <code>atp:</code> as the scheme and 
+     *     the SHA256 hash as the filename (with no extension).
+     * @param {string} hash - The SHA256 hash of the content.
      */
     /**jsdoc
-     * Called when uploadData is complete
-     * @callback Assets~uploadDataCallback
-     * @param {string} url
-     * @param {string} hash
+     * Uploads content to the asset server, storing it in a SHA256-named file.
+     * <p>Note: The asset server destroys any unmapped SHA256-named file at server restart. Use {@link Assets.setMapping} to 
+     * set a path-to-hash mapping for the new file.</p>
+     * @function Assets.uploadData
+     * @param {string} data - The content to upload.
+     * @param {Assets~uploadDataCallback} callback - The function to call upon completion.
+     * @example <caption>Store a string in the asset server.</caption>
+     * Assets.uploadData("Hello world!", function (url, hash) {
+     *     print("URL: " + url);  // atp:0a1b...9g
+     *     Assets.setMapping("/assetsExamples/helloWorld.txt", hash, function (error) {
+     *         if (error) {
+     *             print("ERROR: Could not set mapping!");
+     *             return;
+     *         }
+     *     });
+     * });
      */
     Q_INVOKABLE void uploadData(QString data, QScriptValue callback);
 
     /**jsdoc
-     * Download data from the connected domain's asset server.
-     * @function Assets.downloadData
-     * @param url {string} URL of asset to download, must be ATP scheme URL.
-     * @param callback {Assets~downloadDataCallback}
+     * Called when an {@link Assets.downloadData} call is complete.
+     * @callback Assets~downloadDataCallback
+     * @param {string} data - The content that was downloaded.
+     * @param {Assets.DownloadDataError} error - The success or failure of the download.
      */
     /**jsdoc
-     * Called when downloadData is complete
-     * @callback Assets~downloadDataCallback
-     * @param data {string} content that was downloaded
+     * Downloads content from the asset server, from a SHA256-named file.
+     * @function Assets.downloadData
+     * @param {string} url - The raw URL of asset to download: <code>atp:</code> followed by the assets's SHA256 hash.
+     * @param {Assets~downloadDataCallback} callback - The function to call upon completion.
+     * @example <caption>Store and retrieve a string from the asset server.</caption>
+     * var assetURL;
+     * 
+     * // Store the string.
+     * Assets.uploadData("Hello world!", function (url, hash) {
+     *     assetURL = url;
+     *     print("url: " + assetURL);  // atp:a0g89...
+     *     Assets.setMapping("/assetsExamples/helloWorld.txt", hash, function (error) {
+     *         if (error) {
+     *             print("ERROR: Could not set mapping!");
+     *             return;
+     *         }
+     *     });
+     * });
+     * 
+     * // Retrieve the string.
+     * Script.setTimeout(function () {
+     *     Assets.downloadData(assetURL, function (data, error) {
+     *         print("Downloaded data: " + data);
+     *         print("Error: " + JSON.stringify(error));
+     *     });
+     * }, 1000);
      */
-    Q_INVOKABLE void downloadData(QString url, QScriptValue downloadComplete);
+    Q_INVOKABLE void downloadData(QString url, QScriptValue callback);
 
     /**jsdoc
-     * Sets up a path to hash mapping within the connected domain's asset server
-     * @function Assets.setMapping
-     * @param path {string}
-     * @param hash {string}
-     * @param callback {Assets~setMappingCallback}
+     * Called when an {@link Assets.setMapping} call is complete.
+     * @callback Assets~setMappingCallback
+     * @param {string} error - <code>null</code> if the path-to-hash mapping was set, otherwise a description of the error.
      */
     /**jsdoc
-     * Called when setMapping is complete
-     * @callback Assets~setMappingCallback
-     * @param {string} error
+     * Sets a path-to-hash mapping within the asset server.
+     * @function Assets.setMapping
+     * @param {string} path - A user-friendly path for the file in the asset server, without leading <code>"atp:"</code>.
+     * @param {string} hash - The hash in the asset server.
+     * @param {Assets~setMappingCallback} callback - The function to call upon completion.
      */
     Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback);
 
     /**jsdoc
-     * Look up a path to hash mapping within the connected domain's asset server
-     * @function Assets.getMapping
-     * @param path {string}
-     * @param callback {Assets~getMappingCallback}
+     * Called when an {@link Assets.getMapping} call is complete.
+     * @callback Assets~getMappingCallback
+     * @param {string} error - <code>null</code> if the path was found, otherwise a description of the error.
+     * @param {string} hash - The hash value if the path was found, <code>""</code> if it wasn't.
      */
     /**jsdoc
-     * Called when getMapping is complete.
-     * @callback Assets~getMappingCallback
-     * @param assetID {string} hash value if found, else an empty string
-     * @param error {string} error description if the path could not be resolved; otherwise a null value.
+     * Gets the hash for a path within the asset server. The hash is for the unbaked or baked version of the
+     * asset, according to the asset server setting for the particular path.
+     * @function Assets.getMapping
+     * @param {string} path - The path to a file in the asset server to get the hash of.
+     * @param {Assets~getMappingCallback} callback - The function to call upon completion.
+     * @example <caption>Report the hash of an asset server item.</caption>
+     * var assetPath = Window.browseAssets();
+     * if (assetPath) {
+     *     var mapping = Assets.getMapping(assetPath, function (error, hash) {
+     *         print("Asset: " + assetPath);
+     *         print("- hash:  " + hash);
+     *         print("- error: " + error);
+     *     });
+     * }
      */
     Q_INVOKABLE void getMapping(QString path, QScriptValue callback);
 
     /**jsdoc
-     * @function Assets.setBakingEnabled
-     * @param path {string}
-     * @param enabled {boolean}
-     * @param callback {}
+     * Called when an {@link Assets.setBakingEnabled} call is complete.
+     * @callback Assets~setBakingEnabledCallback
+     * @param {string} error - <code>null</code> if baking was successfully enabled or disabled, otherwise a description of the 
+     * error.
      */
     /**jsdoc
-     * Called when setBakingEnabled is complete.
-     * @callback Assets~setBakingEnabledCallback
+     * Sets whether or not to bake an asset in the asset server.
+     * @function Assets.setBakingEnabled
+     * @param {string} path - The path to a file in the asset server.
+     * @param {boolean} enabled - <code>true</code> to enable baking of the asset, <code>false</code> to disable.
+     * @param {Assets~setBakingEnabledCallback} callback - The function to call upon completion.
      */
+    // Note: Second callback parameter not documented because it's always {}.
     Q_INVOKABLE void setBakingEnabled(QString path, bool enabled, QScriptValue callback);
 
 #if (PR_BUILD || DEV_BUILD)
     /**
      * This function is purely for development purposes, and not meant for use in a
-     * production context. It is not a public-facing API, so it should not contain jsdoc.
+     * production context. It is not a public-facing API, so it should not have JSDoc.
      */
     Q_INVOKABLE void sendFakedHandshake();
 #endif
 
     /**jsdoc
-     * Request Asset data from the ATP Server
-     * @function Assets.getAsset
-     * @param {URL|Assets.GetOptions} options An atp: style URL, hash, or relative mapped path; or an {@link Assets.GetOptions} object with request parameters
-     * @param {Assets~getAssetCallback} scope A scope callback function to receive (error, results) values
-     * @param {function} [callback=undefined]
+     * Details of a callback function.
+     * @typedef {object} Assets.CallbackDetails
+     * @property {object} scope - The scope that the <code>callback</code> function is defined in. This object is bound to 
+     *     <code>this</code> when the function is called.
+     * @property {Assets~compressDataCallback|Assets~decompressDataCallback|Assets~getAssetCallback
+     *     |Assets~getCacheStatusCallback|Assets~loadFromCacheCallback|Assets~putAssetCallback|Assets~queryCacheMetaCallback
+     *     |Assets~resolveAssetCallback|Assets~saveToCacheCallback} 
+     *     callback -  The function to call upon completion. May be an inline function or a function identifier. If a function 
+     *     identifier, it must be a member of <code>scope</code>.
      */
 
     /**jsdoc
-     * A set of properties that can be passed to {@link Assets.getAsset}.
-     * @typedef {object} Assets.GetOptions
-     * @property {string} [url] an "atp:" style URL, hash, or relative mapped path to fetch
-     * @property {string} [responseType=text] the desired reponse type (text | arraybuffer | json)
-     * @property {boolean} [decompress=false] whether to attempt gunzip decompression on the fetched data
-     *    See: {@link Assets.putAsset} and its .compress=true option
-     */
-
-    /**jsdoc
-     * Called when Assets.getAsset is complete.
+     * Called when an {@link Assets.getAsset} call is complete.
      * @callback Assets~getAssetCallback
-     * @param {string} error - contains error message or null value if no error occured fetching the asset
-     * @param {Asset~getAssetResult} result - result object containing, on success containing asset metadata and contents
+     * @param {string} error - <code>null</code> if the content was downloaded, otherwise a description of the error.
+     * @param {Assets.GetResult} result - Information on and the content downloaded.
      */
-
     /**jsdoc
-     * Result value returned by {@link Assets.getAsset}.
-     * @typedef {object} Assets~getAssetResult
-     * @property {string} [url] the resolved "atp:" style URL for the fetched asset
-     * @property {string} [hash] the resolved hash for the fetched asset
-     * @property {string|ArrayBuffer|Object} [response] response data (possibly converted per .responseType value)
-     * @property {string} [responseType] response type (text | arraybuffer | json)
-     * @property {string} [contentType] detected asset mime-type (autodetected)
-     * @property {number} [byteLength] response data size in bytes
-     * @property {number} [decompressed] flag indicating whether data was decompressed
+     * Downloads content from the asset server.
+     * @function Assets.getAsset
+     * @param {string|Assets.GetOptions} source - What to download and download options. If a string, the mapped path or hash 
+     *     to download, optionally including a leading <code>"atp:"</code>.
+     * @param {object|Assets.CallbackDetails|Assets~getAssetCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~getAssetCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Retrieve a string from the asset server.</caption>
+     * Assets.getAsset(
+     *     {
+     *         url: "/assetsExamples/helloWorld.txt",
+     *         responseType: "text"
+     *     },
+     *     function (error, result) {
+     *         if (error) {
+     *             print("ERROR: Data not downloaded");
+     *         } else {
+     *             print("Data: " + result.response);
+     *         }
+     *     }
+     * );
      */
-
     Q_INVOKABLE void getAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
 
     /**jsdoc
-     * Upload Asset data to the ATP Server
+     * Called when an {@link Assets.putAsset} call is complete.
+     * @callback Assets~putAssetCallback
+     * @param {string} error - <code>null</code> if the content was uploaded and any path-to-hash mapping set, otherwise a 
+     *     description of the error.
+     * @param {Assets.PutResult} result - Information on the content uploaded.
+     */
+    /**jsdoc
+     * Uploads content to the asset server and sets a path-to-hash mapping.
      * @function Assets.putAsset
-     * @param {Assets.PutOptions} options A PutOptions object with upload parameters
-     * @param {Assets~putAssetCallback} scope[callback] A scoped callback function invoked with (error, results)
-     * @param {function} [callback=undefined]
+     * @param {string|Assets.PutOptions} options - The content to upload and upload options. If a string, the value of the
+     *     string is uploaded but a path-to-hash mapping is not set.
+     * @param {object|Assets.CallbackDetails|Assets~putAssetCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~putAssetCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Store a string in the asset server.</caption>
+     * Assets.putAsset(
+     *     {
+     *         data: "Hello world!",
+     *         path: "/assetsExamples/helloWorld.txt"
+     *     },
+     *     function (error, result) {
+     *         if (error) {
+     *             print("ERROR: Data not uploaded or mapping not set");
+     *         } else {
+     *             print("URL: " + result.url);  // atp:/assetsExamples/helloWorld.txt
+     *         }
+     *     }
+     * );
      */
-
-    /**jsdoc
-     * A set of properties that can be passed to {@link Assets.putAsset}.
-     * @typedef {object} Assets.PutOptions
-     * @property {ArrayBuffer|string} [data] byte buffer or string value representing the new asset's content
-     * @property {string} [path=null] ATP path mapping to automatically create (upon successful upload to hash)
-     * @property {boolean} [compress=false] whether to gzip compress data before uploading
-     */
-
-    /**jsdoc
-     * Called when Assets.putAsset is complete.
-     * @callback Assets~puttAssetCallback
-     * @param {string} error - contains error message (or null value if no error occured while uploading/mapping the new asset)
-     * @param {Asset~putAssetResult} result - result object containing error or result status of asset upload
-     */
-
-    /**jsdoc
-     * Result value returned by {@link Assets.putAsset}.
-     * @typedef {object} Assets~putAssetResult
-     * @property {string} [url] the resolved "atp:" style URL for the uploaded asset (based on .path if specified, otherwise on the resulting ATP hash)
-     * @property {string} [path] the uploaded asset's resulting ATP path (or undefined if no path mapping was assigned)
-     * @property {string} [hash] the uploaded asset's resulting ATP hash
-     * @property {boolean} [compressed] flag indicating whether the data was compressed before upload
-     * @property {number} [byteLength] flag indicating final byte size of the data uploaded to the ATP server
-     */
-
     Q_INVOKABLE void putAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
 
     /**jsdoc
-     * @function Assets.deleteAsset
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback = ""]
+     * Called when an {@link Assets.deleteAsset} call is complete.
+     * <p class="important">Not implemented: This type is not implemented yet.</p>
+     * @callback Assets~deleteAssetCallback
+     * @param {string} error - <code>null</code> if the content was deleted, otherwise a description of the error.
+     * @param {Assets.DeleteResult} result - Information on the content deleted.
      */
-
-    Q_INVOKABLE void deleteAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
-    
     /**jsdoc
-     * @function Assets.resolveAsset
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback = ""]
+     * Deletes content from the asset server.
+     * <p class="important">Not implemented: This method is not implemented yet.</p>
+     * @function Assets.deleteAsset
+     * @param {Assets.DeleteOptions} options - The content to delete and delete options.
+     * @param {object} scope - The scope that the <code>callback</code> function is defined in.
+     * @param {Assets~deleteAssetCallback} callback - The function to call upon completion.
      */
+    Q_INVOKABLE void deleteAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
 
+    /**jsdoc
+     * Called when an {@link Assets.resolveAsset} call is complete.
+     * @callback Assets~resolveAssetCallback
+     * @param {string} error - <code>null</code> if the asset hash or path was resolved, otherwise a description of the error. 
+     * @param {Assets.ResolveResult} result - Information on the hash or path resolved.
+     */
+    /**jsdoc
+     * Resolves and returns information on a hash or a path in the asset server.
+     * @function Assets.resolveAsset
+     * @param {string|Assets.ResolveOptions} source - The hash or path to resolve if a string, otherwise an object specifying 
+     *     what to resolve. If a string, it may have a leading <code>"atp:"</code>.
+     * @param {object|Assets.CallbackDetails|Assets~resolveAssetCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~resolveAssetCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Get the hash and URL for a path.</caption>
+     * Assets.resolveAsset(
+     *     "/assetsExamples/helloWorld.txt",
+     *     function (error, result) {
+     *         if (error) {
+     *             print("ERROR: " + error);
+     *         } else {
+     *             print("Hash: " + result.hash);
+     *             print("URL: " + result.url);
+     *         }
+     *     }
+     * );
+     */
     Q_INVOKABLE void resolveAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
-     * @function Assets.decompressData
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback = ""]
+     * Called when an {@link Assets.decompressData} call is complete.
+     * @callback Assets~decompressDataCallback
+     * @param {string} error - <code>null</code> if the data was successfully compressed, otherwise a description of the error.
+     * @param {Assets.DecompressResult} result - Information on and the decompressed data.
+     */
+    /**jsdoc
+     * Decompresses data in memory using gunzip.
+     * @function Assets.decompressData
+     * @param {Assets.DecompressOptions} source - What to decompress and decompression options.
+     * @param {object|Assets.CallbackDetails|Assets~decompressDataCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~decompressDataCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
      */
-
     Q_INVOKABLE void decompressData(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
-     * @function Assets.compressData
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback = ""]
+     * Called when an {@link Assets.compressData} call is complete.
+     * @callback Assets~compressDataCallback
+     * @param {string} error - <code>null</code> if the data was successfully compressed, otherwise a description of the error.
+     * @param {Assets.CompressResult} result - Information on and the compressed data.
+     */
+    /**jsdoc
+     * Compresses data in memory using gzip.
+     * @function Assets.compressData
+     * @param {string|ArrayBuffer|Assets.CompressOptions} source - What to compress and compression options. If a string or 
+     *     ArrayBuffer, the data to compress.
+     * @param {object|Assets.CallbackDetails|Assets~compressDataCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~compressDataCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
      */
-
     Q_INVOKABLE void compressData(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
+     * Initializes the cache if it isn't already initialized.
      * @function Assets.initializeCache
-     * @returns {boolean}
+     * @returns {boolean} <code>true</code> if the cache is initialized, <code>false</code> if it isn't.
      */
-
     Q_INVOKABLE bool initializeCache() { return Parent::initializeCache(); }
     
     /**jsdoc
+     * Checks whether the script can write to the cache.
      * @function Assets.canWriteCacheValue
-     * @param {string} url
-     * @returns {boolean}
+     * @param {string} url - <em>Not used.</em>
+     * @returns {boolean} <code>true</code> if the script is an Interface, avatar, or assignment client script, 
+     *     <code>false</code> if the script is a client entity or server entity script.
+     * @example <caption>Report whether the script can write to the cache.</caption>
+     * print("Can write to cache: " + Assets.canWriteCacheValue(null));
      */
-
     Q_INVOKABLE bool canWriteCacheValue(const QUrl& url);
     
     /**jsdoc
-     * @function Assets.getCacheStatus
-     * @param {} scope
-     * @param {} [callback=undefined]
+     * Called when a {@link Assets.getCacheStatus} call is complete.
+     * @callback Assets~getCacheStatusCallback
+     * @param {string} error - <code>null</code> if the cache status was retrieved without error, otherwise a description of 
+     *     the error.
+     * @param {Assets.GetCacheStatusResult} result - Details of the current cache status.
+     */
+    /**jsdoc
+     * Gets the current cache status.
+     * @function Assets.getCacheStatus
+     * @param {object|Assets.CallbackDetails|Assets~getCacheStatusCallback} scopeOrCallback - If an object, then the scope that 
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is 
+     *     called. 
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~getCacheStatusCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function 
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by 
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Report the cache status.</caption>
+     * Assets.getCacheStatus(function (error, status) {
+     *     print("Cache status");
+     *     print("- Error: " + error);
+     *     print("- Status: " + JSON.stringify(status));
+     * });
      */
-
     Q_INVOKABLE void getCacheStatus(QScriptValue scope, QScriptValue callback = QScriptValue()) {
         jsPromiseReady(Parent::getCacheStatus(), scope, callback);
     }
 
     /**jsdoc
-     * @function Assets.queryCacheMeta
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback=undefined]
+     * Called when {@link Assets.queryCacheMeta} is complete.
+     * @callback Assets~queryCacheMetaCallback
+     * @param {string} error - <code>null</code> if the URL has a valid cache entry, otherwise a description of the error.
+     * @param {Assets.CacheItemMetaData} result - Information on an asset in the cache.
+     */
+    /**jsdoc
+     * Gets information about the status of an asset in the cache.
+     * @function Assets.queryCacheMeta
+     * @param {string|Assets.QueryCacheMetaOptions} path - The URL of the cached asset to get information on if a string, 
+     *     otherwise an object specifying the cached asset to get information on. The URL must start with <code>"atp:"</code> 
+     *     or <code>"cache:"</code>.
+     * @param {object|Assets.CallbackDetails|Assets~queryCacheMetaCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~queryCacheMetaCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Report details of a string store in the cache.</caption>
+     * Assets.queryCacheMeta(
+     *     "cache:/cacheExample/helloCache.txt",
+     *     function (error, result) {
+     *         if (error) {
+     *             print("Error: " + error);
+     *         } else {
+     *             print("Success:");
+     *             print("- URL: " + result.url);
+     *             print("- isValid: " + result.isValid);
+     *             print("- saveToDisk: " + result.saveToDisk);
+     *             print("- expirationDate: " + result.expirationDate);
+     *         }
+     *     }
+     * );
      */
-
     Q_INVOKABLE void queryCacheMeta(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
-     * @function Assets.loadFromCache
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback=undefined]
+     * Called when an {@link Assets.loadFromCache} call is complete.
+     * @callback Assets~loadFromCacheCallback
+     * @param {string} error - <code>null</code> if the cache item was successfully retrieved, otherwise a description of the 
+     *     error.
+     * @param {Assets.LoadFromCacheResult} result - Information on and the retrieved data.
+     */
+    /**jsdoc
+     * Retrieves data from the cache directly, without downloading it. 
+     * @function Assets.loadFromCache
+     * @param {string|Assets.LoadFromCacheOptions} options - The URL of the asset to load from the cache if a string, otherwise 
+     *     an object specifying the asset to load from the cache and load options. The URL must start with <code>"atp:"</code> 
+     *     or <code>"cache:"</code>.
+     * @param {object|Assets.CallbackDetails|Assets~loadFromCacheCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~loadFromCacheCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Retrieve a string from the cache.</caption>
+     * Assets.loadFromCache(
+     *     "cache:/cacheExample/helloCache.txt",
+     *     function (error, result) {
+     *         if (error) {
+     *             print("Error: " + error);
+     *         } else {
+     *             print("Success:");
+     *             print("- Response: " + result.response);
+     *             print("- Content type: " + result.contentType);
+     *             print("- Number of bytes: " + result.byteLength);
+     *             print("- Bytes: " + [].slice.call(new Uint8Array(result.data), 0, result.byteLength));
+     *             print("- URL: " + result.url);
+     *         }
+     *     }
+     * );
      */
-
     Q_INVOKABLE void loadFromCache(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
-     * @function Assets.saveToCache
-     * @param {} options
-     * @param {} scope
-     * @param {} [callback=undefined]
+     * Called when an {@link Assets.saveToCache} call is complete.
+     * @callback Assets~saveToCacheCallback
+     * @param {string} error - <code>null</code> if the asset data was successfully saved to the cache, otherwise a description 
+     *     of the error.
+     * @param {Assets.SaveToCacheResult} result - Information on the cached data.
+     */
+    /**jsdoc
+     * Saves asset data to the cache directly, without downloading it from a URL.
+     * <p>Note: Can only be used in Interface, avatar, and assignment client scripts.</p>
+     * @function Assets.saveToCache
+     * @param {Assets.SaveToCacheOptions} options - The data to save to the cache and cache options.
+     * @param {object|Assets.CallbackDetails|Assets~saveToCacheCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~saveToCacheCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
+     * @example <caption>Save a string in the cache.</caption>
+     * Assets.saveToCache(
+     *     {
+     *         url: "cache:/cacheExample/helloCache.txt",
+     *         data: "Hello cache"
+     *     },
+     *     function (error, result) {
+     *         if (error) {
+     *             print("Error: " + error);
+     *         } else {
+     *             print("Success:");
+     *             print("- Bytes: " + result.byteLength);
+     *             print("- URL: " + result.url);
+     *         }
+     *     }
+     * );
      */
-
     Q_INVOKABLE void saveToCache(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue());
     
     /**jsdoc
+     * Saves asset data to the cache directly, without downloading it from a URL.
+     * <p>Note: Can only be used in Interface, avatar, and assignment client scripts.</p>
      * @function Assets.saveToCache
-     * @param {} url
-     * @param {} data
-     * @param {} metadata
-     * @param {} scope
-     * @param {} [callback=undefined]
+     * @param {string} url - The URL to associate with the cache item. Must start with <code>"atp:"</code> or 
+     *     <code>"cache:"</code>.
+     * @param {string|ArrayBuffer} data - The data to save to the cache.
+     * @param {Assets.SaveToCacheHeaders} headers - The last-modified and expiry times for the cache item.
+     * @param {object|Assets.CallbackDetails|Assets~saveToCacheCallback} scopeOrCallback - If an object, then the scope that
+     *     the <code>callback</code> function is defined in. This object is bound to <code>this</code> when the function is
+     *     called.
+     *     <p>Otherwise, the function to call upon completion. This may be an inline function or a function identifier.</p>
+     * @param {Assets~saveToCacheCallback} [callback] - Used if <code>scopeOrCallback</code> specifies the scope.
+     *     <p>The function to call upon completion. May be an inline function, a function identifier, or the name of a function
+     *     in a string. If the name of a function or a function identifier, it must be a member of the scope specified by
+     *     <code>scopeOrCallback</code>.</p>
      */
-
     Q_INVOKABLE void saveToCache(const QUrl& url, const QByteArray& data, const QVariantMap& metadata,
                                  QScriptValue scope, QScriptValue callback = QScriptValue());
 protected:
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index e57d80274a..f95edb482b 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -117,7 +117,7 @@ void RecordingScriptingInterface::startPlaying() {
 }
 
 void RecordingScriptingInterface::setPlayerVolume(float volume) {
-    // FIXME 
+    _player->setVolume(std::min(std::max(volume, 0.0f), 1.0f));
 }
 
 void RecordingScriptingInterface::setPlayerAudioOffset(float audioOffset) {
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h
index 6a058feea5..604ec6bc2e 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.h
+++ b/libraries/script-engine/src/RecordingScriptingInterface.h
@@ -95,8 +95,9 @@ public slots:
 
 
     /**jsdoc
+     * Sets the playback audio volume.
      * @function Recording.setPlayerVolume
-     * @param {number} volume
+     * @param {number} volume - The playback audio volume, range <code>0.0</code> &ndash; <code>1.0</code>.
      */
     void setPlayerVolume(float volume);
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 6808da2e1a..8337d1911a 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -38,6 +38,7 @@
 
 #include <QtScriptTools/QScriptEngineDebugger>
 
+#include <shared/LocalFileAccessGate.h>
 #include <shared/QtHelpers.h>
 #include <AudioConstants.h>
 #include <AudioEffectOptions.h>
@@ -236,6 +237,11 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
     }
 }
 
+QString ScriptEngine::getTypeAsString() const {
+    auto value = QVariant::fromValue(_type).toString();
+    return value.isEmpty() ? "unknown" : value.toLower();
+}
+
 QString ScriptEngine::getContext() const {
     switch (_context) {
         case CLIENT_SCRIPT:
@@ -422,6 +428,12 @@ void ScriptEngine::waitTillDoneRunning() {
             if (isEvaluating()) {
                 qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
                 abortEvaluation();
+            } else {
+                auto context = currentContext();
+                if (context) {
+                    qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
+                    context->throwError("Timed out during shutdown");
+                }
             }
 
             // Wait for the scripting thread to stop running, as
@@ -444,9 +456,9 @@ void ScriptEngine::waitTillDoneRunning() {
                     qCWarning(scriptengine) << "Script Engine has been running too long, aborting:" << getFilename();
                     abortEvaluation();
                 } else {
-                    qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
                     auto context = currentContext();
                     if (context) {
+                        qCWarning(scriptengine) << "Script Engine has been running too long, throwing:" << getFilename();
                         context->throwError("Timed out during shutdown");
                     }
                 }
@@ -1117,6 +1129,12 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
 }
 
 void ScriptEngine::run() {
+    if (QThread::currentThread() != qApp->thread() && _context == Context::CLIENT_SCRIPT) {
+        // Flag that we're allowed to access local HTML files on UI created from C++ calls on this thread
+        // (because we're a client script)
+        hifi::scripting::setLocalAccessSafeThread(true);
+    }
+
     auto filenameParts = _fileNameString.split("/");
     auto name = filenameParts.size() > 0 ? filenameParts[filenameParts.size() - 1] : "unknown";
     PROFILE_SET_THREAD_NAME("Script: " + name);
@@ -1294,6 +1312,9 @@ void ScriptEngine::run() {
 
     emit finished(_fileNameString, qSharedPointerCast<ScriptEngine>(sharedFromThis()));
 
+    // Don't leave our local-file-access flag laying around, reset it to false when the scriptengine 
+    // thread is finished
+    hifi::scripting::setLocalAccessSafeThread(false);
     _isRunning = false;
     emit runningStateChanged();
     emit doneRunning();
@@ -2204,7 +2225,7 @@ void ScriptEngine::loadEntityScript(const EntityItemID& entityID, const QString&
 /**jsdoc
  * Triggered when the script starts for a user. See also, {@link Script.entityScriptPreloadFinished}.
  * <p>Note: Can only be connected to via <code>this.preload = function (...) { ... }</code> in the entity script.</p>
- * <table><tr><th>Available in:</th><td>Client Entity Scripts</td><td>Server Entity Scripts</td></tr></table>
+ * <p class="availableIn"><strong>Supported Script Types:</strong> Client Entity Scripts &bull; Server Entity Scripts</p>
  * @function Entities.preload
  * @param {Uuid} entityID - The ID of the entity that the script is running in.
  * @returns {Signal}
@@ -2410,7 +2431,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
 /**jsdoc
  * Triggered when the script terminates for a user.
  * <p>Note: Can only be connected to via <code>this.unoad = function () { ... }</code> in the entity script.</p>
- * <table><tr><th>Available in:</th><td>Client Entity Scripts</td><td>Server Entity Scripts</td></tr></table>
+ * <p class="availableIn"><strong>Supported Script Types:</strong> Client Entity Scripts &bull; Server Entity Scripts</p>
  * @function Entities.unload
  * @param {Uuid} entityID - The ID of the entity that the script is running in.
  * @returns {Signal}
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index d738b13ecc..94381ede02 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -122,6 +122,8 @@ public:
 class ScriptEngine : public BaseScriptEngine, public EntitiesScriptEngineProvider {
     Q_OBJECT
     Q_PROPERTY(QString context READ getContext)
+    Q_PROPERTY(QString type READ getTypeAsString)
+    Q_PROPERTY(QString fileName MEMBER _fileNameString CONSTANT)
 public:
 
     enum Context {
@@ -138,6 +140,7 @@ public:
         AGENT,
         AVATAR
     };
+    Q_ENUM(Type)
 
     static int processLevelMaxRetries;
     ScriptEngine(Context context, const QString& scriptContents = NO_SCRIPT, const QString& fileNameString = QString("about:ScriptEngine"));
@@ -351,8 +354,10 @@ public:
     Q_INVOKABLE void removeEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler);
 
     /**jsdoc
-     * Starts running another script in Interface.
-     * <table><tr><th>Available in:</th><td>Interface Scripts</td><td>Avatar Scripts</td></tr></table>
+     * Starts running another script in Interface, if it isn't already running. The script is not automatically loaded next 
+     * time Interface starts.
+     * <p class="availableIn"><strong>Supported Script Types:</strong> Interface Scripts &bull; Avatar Scripts</p>
+     * <p>See also, {@link ScriptDiscoveryService.loadScript}.</p>
      * @function Script.load
      * @param {string} filename - The URL of the script to load. This can be relative to the current script's URL.
      * @example <caption>Load a script from another script.</caption>
@@ -414,8 +419,10 @@ public:
      * Provides access to methods or objects provided in an external JavaScript or JSON file. 
      * See {@link https://docs.highfidelity.com/script/js-tips.html} for further details.
      * @function Script.require
-     * @param {string} module - The module to use. May be a JavaScript file or the name of a system module such as 
-     *     <code>"sppUi"</code>.
+     * @param {string} module - The module to use. May be a JavaScript file, a JSON file, or the name of a system module such 
+     *     as <code>"appUi"</code> (i.e., the "appUi.js" system module JavaScript file).
+     * @returns {object|array} The value assigned to <code>module.exports</code> in the JavaScript file, or the value defined 
+     *     in the JSON file.
      */
     Q_INVOKABLE QScriptValue require(const QString& moduleId);
 
@@ -632,6 +639,7 @@ public:
 
     void setType(Type type) { _type = type; };
     Type getType() { return _type; };
+    QString getTypeAsString() const;
 
     bool isFinished() const { return _isFinished; } // used by Application and ScriptWidget
     bool isRunning() const { return _isRunning; } // used by ScriptWidget
@@ -754,8 +762,8 @@ signals:
     void cleanupMenuItem(const QString& menuItemString);
 
     /**jsdoc
-     * Triggered when a script prints a message to the program log via {@link Script.print}, {@link  print}, 
-     * {@link console.log}, {@link console.info}, {@link console.warn}, {@link console.error}, or {@link console.debug}.
+     * Triggered when the script prints a message to the program log via {@link  print}, {@link Script.print}, 
+     * {@link console.log}, or {@link console.debug}.
      * @function Script.printedMessage
      * @param {string} message - The message.
      * @param {string} scriptName - The name of the script that generated the message.
@@ -764,7 +772,7 @@ signals:
     void printedMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
-     * Triggered when a script generates an error or {@link console.error} is called.
+     * Triggered when the script generates an error or {@link console.error} is called.
      * @function Script.errorMessage
      * @param {string} message - The error message.
      * @param {string} scriptName - The name of the script that generated the error message.
@@ -773,7 +781,7 @@ signals:
     void errorMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
-     * Triggered when a script generates a warning or {@link console.warn} is called.
+     * Triggered when the script generates a warning or {@link console.warn} is called.
      * @function Script.warningMessage
      * @param {string} message - The warning message.
      * @param {string} scriptName - The name of the script that generated the warning message.
@@ -782,7 +790,7 @@ signals:
     void warningMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
-     * Triggered when a script generates an information message or {@link console.info} is called.
+     * Triggered when the script generates an information message or {@link console.info} is called.
      * @function Script.infoMessage
      * @param {string} message - The information message.
      * @param {string} scriptName - The name of the script that generated the information message.
@@ -840,13 +848,14 @@ signals:
 
     /**jsdoc
      * Triggered when the script starts for the user. See also, {@link Entities.preload}.
-     * <table><tr><th>Available in:</th><td>Client Entity Scripts</td><td>Server Entity Scripts</td></tr></table>
+     * <p class="availableIn"><strong>Supported Script Types:</strong> Client Entity Scripts &bull; Server Entity Scripts</p>
      * @function Script.entityScriptPreloadFinished
      * @param {Uuid} entityID - The ID of the entity that the script is running in.
      * @returns {Signal}
      * @example <caption>Get the ID of the entity that a client entity script is running in.</caption>
-     * var entityScript = (function () {
+     * var entityScript = function () {
      *     this.entityID = Uuid.NULL;
+     * };
      *
      * Script.entityScriptPreloadFinished.connect(function (entityID) {
      *     this.entityID = entityID;
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 69455294d6..fd2ebe300d 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -136,24 +136,6 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) {
 
 QObject* scriptsModel();
 
-bool NativeScriptInitializers::registerNativeScriptInitializer(NativeScriptInitializer initializer) {
-    return registerScriptInitializer([initializer](ScriptEnginePointer engine) {
-        initializer(qobject_cast<QScriptEngine*>(engine.data()));
-    });
-}
-
-bool NativeScriptInitializers::registerScriptInitializer(ScriptInitializer initializer) {
-    if (auto scriptEngines = DependencyManager::get<ScriptEngines>().data()) {
-        scriptEngines->registerScriptInitializer(initializer);
-        return true;
-    }
-    return false;
-}
-
-void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) {
-    _scriptInitializers.push_back(initializer);
-}
-
 void ScriptEngines::addScriptEngine(ScriptEnginePointer engine) {
     if (!_isStopped) {
         QMutexLocker locker(&_allScriptsMutex);
@@ -209,6 +191,18 @@ void ScriptEngines::shutdownScripting() {
     qCDebug(scriptengine) << "DONE Stopping all scripts....";
 }
 
+/**jsdoc
+ * Information on a public script, i.e., a script that's included in the Interface installation.
+ * @typedef {object} ScriptDiscoveryService.PublicScript
+ * @property {string} name - The script's file name.
+ * @property {string} type - <code>"script"</code> or <code>"folder"</code>.
+ *     <p class="important">Deprecated: This property is deprecated and will be removed. It currently always has the value, 
+ *     <code>"script"</code>.</p>
+ * @property {ScriptDiscoveryService.PublicScript[]} [children] - Only present if <code>type == "folder"</code>.
+ *     <p class="important">Deprecated: This property is deprecated and will be removed. It currently is never present.
+ * @property {string} [url] - The full URL of the script &mdash; including the <code>"file:///"</code> scheme at the start.
+ *     <p>Only present if <code>type == "script"</code>.</p>
+ */
 QVariantList getPublicChildNodes(TreeNodeFolder* parent) {
     QVariantList result;
     QList<TreeNodeBase*> treeNodes = getScriptsModel().getFolderNodes(parent);
@@ -240,6 +234,13 @@ QVariantList ScriptEngines::getPublic() {
     return getPublicChildNodes(NULL);
 }
 
+/**jsdoc
+ * Information on a local script.
+ * @typedef {object} ScriptDiscoveryService.LocalScript
+ * @property {string} name - The script's file name.
+ * @property {string} path - The script's path.
+ * @deprecated This type is deprecated and will be removed.
+ */
 QVariantList ScriptEngines::getLocal() {
     QVariantList result;
     QList<TreeNodeBase*> treeNodes = getScriptsModel().getFolderNodes(NULL);
@@ -260,6 +261,15 @@ QVariantList ScriptEngines::getLocal() {
     return result;
 }
 
+/**jsdoc
+ * Information on a running script.
+ * @typedef {object} ScriptDiscoveryService.RunningScript
+ * @property {boolean} local - <code>true</code> if the script is a local file (i.e., the scheme is "file"), <code>false</code> 
+ *     if it isn't (e.g., the scheme is "http").
+ * @property {string} name - The script's file name.
+ * @property {string} path - The script's path and file name &mdash; excluding the scheme if a local file.
+ * @property {string} url - The full URL of the script &mdash; including the scheme if a local file.
+ */
 QVariantList ScriptEngines::getRunning() {
     QVariantList result;
     auto runningScripts = getRunningScripts();
@@ -562,12 +572,8 @@ void ScriptEngines::quitWhenFinished() {
 }
 
 int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
-    int ii=0;
-    for (auto initializer : _scriptInitializers) {
-        ii++;
-        initializer(scriptEngine);
-    }
-    return ii;
+    auto nativeCount = DependencyManager::get<ScriptInitializers>()->runScriptInitializers(scriptEngine.data());
+    return nativeCount + ScriptInitializerMixin<ScriptEnginePointer>::runScriptInitializers(scriptEngine);
 }
 
 void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index de836a3e09..df736e101d 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -28,25 +28,28 @@
 class ScriptEngine;
 
 /**jsdoc
+ * The <code>ScriptDiscoveryService</code> API provides facilities to work with Interface scripts.
+ *
  * @namespace ScriptDiscoveryService
  *
  * @hifi-interface
- * @hifi-client-entity
  * @hifi-avatar
+ * @hifi-client-entity
  *
- * @property {string} debugScriptUrl
- * @property {string} defaultScriptsPath
- * @property {ScriptsModel} scriptsModel
- * @property {ScriptsModelFilter} scriptsModelFilter
+ * @property {string} debugScriptUrl="" - The path and name of a script to debug using the "API Debugger" developer tool 
+ *     (currentAPI.js). If set, the API Debugger dialog displays the objects and values exposed by the script using 
+ *     {@link Script.registerValue} and similar.
+ * @property {string} defaultScriptsPath - The path where the default scripts are located in the Interface installation. 
+ *     <em>Read-only.</em>
+ * @property {ScriptsModel} scriptsModel - Information on the scripts that are in the default scripts directory of the 
+ *     Interface installation.
+ *     <em>Read-only.</em>
+ * @property {ScriptsModelFilter} scriptsModelFilter - Sorted and filtered information on the scripts that are in the default 
+ *     scripts directory of the Interface installation.
+ *     <em>Read-only.</em>
  */
 
-class NativeScriptInitializers : public ScriptInitializerMixin {
-public:
-    bool registerNativeScriptInitializer(NativeScriptInitializer initializer) override;
-    bool registerScriptInitializer(ScriptInitializer initializer) override;
-};
-
-class ScriptEngines : public QObject, public Dependency {
+class ScriptEngines : public QObject, public Dependency, public ScriptInitializerMixin<ScriptEnginePointer> {
     Q_OBJECT
 
     Q_PROPERTY(ScriptsModel* scriptsModel READ scriptsModel CONSTANT)
@@ -54,11 +57,9 @@ class ScriptEngines : public QObject, public Dependency {
     Q_PROPERTY(QString debugScriptUrl READ getDebugScriptUrl WRITE setDebugScriptUrl)
 
 public:
-    using ScriptInitializer = ScriptInitializerMixin::ScriptInitializer;
-
     ScriptEngines(ScriptEngine::Context context, const QUrl& defaultScriptsOverride = QUrl());
-    void registerScriptInitializer(ScriptInitializer initializer);
-    int runScriptInitializers(ScriptEnginePointer engine);
+    int runScriptInitializers(ScriptEnginePointer engine) override;
+
     void loadScripts();
     void saveScripts();
 
@@ -77,61 +78,92 @@ public:
     QString getDefaultScriptsLocation() const;
 
     /**jsdoc
+     * Starts running an Interface script, if it isn't already running. The script is automatically loaded next time Interface 
+     * starts.
+     * <p>This is a synonym for calling {@link ScriptDiscoveryService.loadScript|loadScript} with just the script URL.</p>
+     * <p class="availableIn"><strong>Supported Script Types:</strong> Interface Scripts &bull; Avatar Scripts</p>
+     * <p>See also, {@link Script.load}.</p>
      * @function ScriptDiscoveryService.loadOneScript
-     * @param {string} filename
+     * @param {string} url - The path and name of the script. If a local file, including the <code>"file:///"</code> scheme is 
+     *     optional.
      */
     Q_INVOKABLE void loadOneScript(const QString& scriptFilename);
 
     /**jsdoc
+     * Starts running an Interface script, if it isn't already running.
+     * <p class="availableIn"><strong>Supported Script Types:</strong> Interface Scripts &bull; Avatar Scripts</p>
+     * <p>See also, {@link Script.load}.</p>
      * @function ScriptDiscoveryService.loadScript
-     * @param {string} [filename=""]
-     * @param {boolean} [isUserLoaded=true]
-     * @param {boolean} [loadScriptFromEditor=false]
-     * @param {boolean} [activateMainWindow=false]
-     * @param {boolean} [reload=false]
-     * @param {boolean} [quitWhenFinished=false]
-     * @returns {boolean}
+     * @param {string} [url=""] - The path and name of the script. If a local file, including the <code>"file:///"</code> 
+     *     scheme is optional.
+     * @param {boolean} [isUserLoaded=true] - <code>true</code> if the user specifically loaded it, <code>false</code> if not 
+     *     (e.g., a script loaded it). If <code>false</code>, the script is not automatically loaded next time Interface starts.
+     * @param {boolean} [loadScriptFromEditor=false] - <em>Not used.</em>
+     * @param {boolean} [activateMainWindow=false] - <em>Not used.</em>
+     * @param {boolean} [reload=false] - <code>true</code> to redownload the script, <code>false</code> to use the copy from 
+     *     the cache if available.
+     * @param {boolean} [quitWhenFinished=false] - <code>true</code> to close Interface when the script finishes, 
+     *     <code>false</code> to not close Interface.
+     * @returns {object} An empty object, <code>{}</code>.
      */
     Q_INVOKABLE ScriptEnginePointer loadScript(const QUrl& scriptFilename = QString(),
         bool isUserLoaded = true, bool loadScriptFromEditor = false, bool activateMainWindow = false, bool reload = false, bool quitWhenFinished = false);
 
     /**jsdoc
+     * Stops or restarts an Interface script.
      * @function ScriptDiscoveryService.stopScript
-     * @param {string} scriptHash
-     * @param {boolean} [restart=false]
-     * @returns {boolean}
+     * @param {string} url - The path and name of the script. If a local file, including the <code>"file:///"</code> scheme is 
+     *     optional.
+     * @param {boolean} [restart=false] -  <code>true</code> to redownload and restart the script, <code>false</code> to stop 
+     *     it.
+     * @returns {boolean} <code>true</code> if the script was successfully stopped or restarted, <code>false</code> if it 
+     *     wasn't (e.g., the script couldn't be found).
      */
     Q_INVOKABLE bool stopScript(const QString& scriptHash, bool restart = false);
 
 
     /**jsdoc
-    * @function ScriptDiscoveryService.reloadAllScripts
-    */
+     * Restarts all Interface, avatar, and client entity scripts after clearing the scripts cache.
+     * @function ScriptDiscoveryService.reloadAllScripts
+     */
     Q_INVOKABLE void reloadAllScripts();
 
     /**jsdoc
+     * Stops or restarts all Interface scripts. The scripts cache is not cleared. If restarting, avatar and client entity 
+     * scripts are also restarted.
      * @function ScriptDiscoveryService.stopAllScripts
-     * @param {boolean} [restart=false]
+     * @param {boolean} [restart=false] - <code>true</code> to restart the scripts, <code>false</code> to stop them.
      */
     Q_INVOKABLE void stopAllScripts(bool restart = false);
 
 
     /**jsdoc
+     * Gets a list of all Interface scripts that are currently running.
      * @function ScriptDiscoveryService.getRunning
-     * @returns {object[]}
+     * @returns {ScriptDiscoveryService.RunningScript[]} All Interface scripts that are currently running.
+     * @example <caption>Report all running scripts.</caption>
+     * var runningScripts = ScriptDiscoveryService.getRunning();
+     * print("Running scripts:");
+     * for (var i = 0; i < runningScripts.length; i++) {
+     *     print(JSON.stringify(runningScripts[i]));
+     * }
      */
     Q_INVOKABLE QVariantList getRunning();
 
     /**jsdoc
+     * Gets a list of all script files that are in the default scripts directory of the Interface installation.
      * @function ScriptDiscoveryService.getPublic
-     * @returns {object[]}
+     * @returns {ScriptDiscoveryService.PublicScript[]} All scripts in the "scripts" directory of the Interface 
+     *     installation.
      */
     Q_INVOKABLE QVariantList getPublic();
 
     /**jsdoc
      * @function ScriptDiscoveryService.getLocal
-     * @returns {object[]}
+     * @returns {ScriptDiscoveryService.LocalScript[]} Local scripts.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because there is no longer a notion of a "local" scripts folder where you would put your personal scripts.
     Q_INVOKABLE QVariantList getLocal();
 
     // FIXME: Move to other Q_PROPERTY declarations.
@@ -148,65 +180,82 @@ public:
 signals:
 
     /**jsdoc
+     * Triggered when the number of Interface scripts running changes.
      * @function ScriptDiscoveryService.scriptCountChanged
      * @returns {Signal}
+     * @example <caption>Report when the number of running scripts changes.</caption>
+     * ScriptDiscoveryService.scriptCountChanged.connect(function () {
+     *     print("Scripts count changed: " + ScriptDiscoveryService.getRunning().length);
+     * });
      */
     void scriptCountChanged();
 
     /**jsdoc
+     * Triggered when Interface, avatar, and client entity scripts are restarting as a result of
+     * {@link ScriptDiscoveryService.reloadAllScripts|reloadAllScripts} or 
+     * {@link ScriptDiscoveryService.stopAllScripts|stopAllScripts}.
      * @function ScriptDiscoveryService.scriptsReloading
      * @returns {Signal}
      */
     void scriptsReloading();
 
     /**jsdoc
+     * Triggered when a script could not be loaded.
      * @function ScriptDiscoveryService.scriptLoadError
-     * @param {string} filename
-     * @param {string} error
+     * @param {string} url - The path and name of the script that could not be loaded.
+     * @param {string} error - <code>""</code> always.
      * @returns {Signal}
      */
     void scriptLoadError(const QString& filename, const QString& error);
 
     /**jsdoc
+     * Triggered when any script prints a message to the program log via {@link  print}, {@link Script.print},
+     * {@link console.log}, or {@link console.debug}.
      * @function ScriptDiscoveryService.printedMessage
-     * @param {string} message
-     * @param {string} engineName
+     * @param {string} message - The message.
+     * @param {string} scriptName - The name of the script that generated the message.
      * @returns {Signal}
      */
     void printedMessage(const QString& message, const QString& engineName);
 
     /**jsdoc
+     * Triggered when any script generates an error or {@link console.error} is called.
      * @function ScriptDiscoveryService.errorMessage
-     * @param {string} message
-     * @param {string} engineName
+     * @param {string} message - The error message.
+     * @param {string} scriptName - The name of the script that generated the error message.
      * @returns {Signal}
      */
     void errorMessage(const QString& message, const QString& engineName);
 
     /**jsdoc
+     * Triggered when any script generates a warning or {@link console.warn} is called.
      * @function ScriptDiscoveryService.warningMessage
-     * @param {string} message
-     * @param {string} engineName
+     * @param {string} message - The warning message.
+     * @param {string} scriptName - The name of the script that generated the warning message.
      * @returns {Signal}
      */
     void warningMessage(const QString& message, const QString& engineName);
 
     /**jsdoc
+     * Triggered when any script generates an information message or {@link console.info} is called.
      * @function ScriptDiscoveryService.infoMessage
-     * @param {string} message
-     * @param {string} engineName
+     * @param {string} message - The information message.
+     * @param {string} scriptName - The name of the script that generated the informaton message.
      * @returns {Signal}
      */
     void infoMessage(const QString& message, const QString& engineName);
 
     /**jsdoc
      * @function ScriptDiscoveryService.errorLoadingScript
-     * @param {string} url
+     * @param {string} url - URL.
      * @returns {Signal}
+     * @deprecated This signal is deprecated and will be removed.
      */
+    // Deprecated because never emitted.
     void errorLoadingScript(const QString& url);
 
     /**jsdoc
+     * Triggered when the Debug Window is cleared.
      * @function ScriptDiscoveryService.clearDebugWindow
      * @returns {Signal}
      */
@@ -216,50 +265,64 @@ public slots:
 
     /**jsdoc
      * @function ScriptDiscoveryService.onPrintedMessage
-     * @param {string} message
-     * @param {string} scriptName
+     * @param {string} message - Message.
+     * @param {string} scriptName - Script name.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal.
     void onPrintedMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
      * @function ScriptDiscoveryService.onErrorMessage
-     * @param {string} message
-     * @param {string} scriptName
+     * @param {string} message - Message.
+     * @param {string} scriptName - Script name.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal.
     void onErrorMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
      * @function ScriptDiscoveryService.onWarningMessage
-     * @param {string} message
-     * @param {string} scriptName
+     * @param {string} message - Message.
+     * @param {string} scriptName - Script name.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal.
     void onWarningMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
      * @function ScriptDiscoveryService.onInfoMessage
-     * @param {string} message
-     * @param {string} scriptName
+     * @param {string} message - Message.
+     * @param {string} scriptName - Script name.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal.
     void onInfoMessage(const QString& message, const QString& scriptName);
 
     /**jsdoc
      * @function ScriptDiscoveryService.onErrorLoadingScript
-     * @param {string} url
+     * @param {string} url - URL.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal. And it isn't used.
     void onErrorLoadingScript(const QString& url);
 
     /**jsdoc
      * @function ScriptDiscoveryService.onClearDebugWindow
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because only use is to emit a signal.
     void onClearDebugWindow();
 
 protected slots:
 
     /**jsdoc
      * @function ScriptDiscoveryService.onScriptFinished
-     * @param {string} filename
-     * @param {object} engine
+     * @param {string} scriptName - Script name.
+     * @param {object} engine - Engine.
+     * @deprecated This function is deprecated and will be removed.
      */
+    // Deprecated because it wasn't intended to be in the API.
     void onScriptFinished(const QString& fileNameString, ScriptEnginePointer engine);
 
 protected:
@@ -277,7 +340,6 @@ protected:
     QHash<QUrl, ScriptEnginePointer> _scriptEnginesHash;
     QSet<ScriptEnginePointer> _allKnownScriptEngines;
     QMutex _allScriptsMutex;
-    std::list<ScriptInitializer> _scriptInitializers;
     ScriptsModel _scriptsModel;
     ScriptsModelFilter _scriptsModelFilter;
     std::atomic<bool> _isStopped { false };
diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp
index 5f30033bf9..429c7f5518 100644
--- a/libraries/script-engine/src/ScriptsModel.cpp
+++ b/libraries/script-engine/src/ScriptsModel.cpp
@@ -78,13 +78,16 @@ TreeNodeBase* ScriptsModel::getTreeNodeFromIndex(const QModelIndex& index) const
 }
 
 QModelIndex ScriptsModel::index(int row, int column, const QModelIndex& parent) const {
-    if (row < 0 || column < 0) {
+    if (row < 0 || row >= rowCount(parent) || column < 0  || column >= columnCount(parent)) {
         return QModelIndex();
     }
     return createIndex(row, column, getFolderNodes(static_cast<TreeNodeFolder*>(getTreeNodeFromIndex(parent))).at(row));
 }
 
 QModelIndex ScriptsModel::parent(const QModelIndex& child) const {
+    if (!child.isValid()) {
+        return QModelIndex();
+    }
     TreeNodeFolder* parent = (static_cast<TreeNodeBase*>(child.internalPointer()))->getParent();
     if (!parent) {
         return QModelIndex();
diff --git a/libraries/script-engine/src/ScriptsModel.h b/libraries/script-engine/src/ScriptsModel.h
index adfb15affc..bd6c9687c1 100644
--- a/libraries/script-engine/src/ScriptsModel.h
+++ b/libraries/script-engine/src/ScriptsModel.h
@@ -64,14 +64,60 @@ public:
 };
 
 /**jsdoc
- * <p>Provided as a property of {@link ScriptDiscoveryService}.</p>
- * <p>Has properties and functions below in addition to those of <a href="http://doc.qt.io/qt-5/qabstractitemmodel.html">
- * http://doc.qt.io/qt-5/qabstractitemmodel.html</a>.</p>
+ * Information on the scripts that are in the default scripts directory of the Interface installation. This is provided as a 
+ * property of {@link ScriptDiscoveryService}.
+ *
+ * <p>The information provided reflects the subdirectory structure. Methods and signals are per QT's 
+ * <a href="http://doc.qt.io/qt-5/qabstractitemmodel.html">QAbstractItemModel</a> class, with the following details:</p>
+ * <ul>
+ *   <li>A single column of data: <code>columnCount(index)</code> returns <code>1</code>. </li>
+ *   <li>Data is provided for the following roles:
+ *     <table>
+ *       <thead>
+ *         <tr><th>Role</th><th>Value</th><th>Description</th></tr>
+ *       </thead>
+ *       <tbody>
+ *         <tr><td>Display</td><td><code>0</code></td><td>The directory or script file name.</td></tr>
+ *         <tr><td>Path</td><td><code>256</code></td><td>The path and filename of the data item if it is a script, 
+ *         <code>undefined</code> if it is a directory.</td></tr>
+ *       </tbody>
+ *     </table>
+ *   </li>
+ *   <li>Use <code>null</code> for the root directory's index.</li>
+ * </ul>
+ *
  * @class ScriptsModel
+
+ * @hideconstructor
  *
  * @hifi-interface
  * @hifi-client-entity
  * @hifi-avatar
+ *
+ * @example <caption>List the first 2 levels of the scripts directory.</caption>
+ * var MAX_DIRECTORY_LEVEL = 1;
+ * var DISPLAY_ROLE = 0;
+ * var PATH_ROLE = 256;
+ * 
+ * function printDirectory(parentIndex, directoryLevel, indent) {
+ *     var numRows = ScriptDiscoveryService.scriptsModel.rowCount(parentIndex);
+ *     for (var i = 0; i < numRows; i++) {
+ *         var rowIndex = ScriptDiscoveryService.scriptsModel.index(i, 0, parentIndex);
+ * 
+ *         var name = ScriptDiscoveryService.scriptsModel.data(rowIndex, DISPLAY_ROLE);
+ *         var hasChildren = ScriptDiscoveryService.scriptsModel.hasChildren(rowIndex);
+ *         var path = hasChildren ? "" : ScriptDiscoveryService.scriptsModel.data(rowIndex, PATH_ROLE);
+ * 
+ *         print(indent + "- " + name + (hasChildren ? "" : " - " + path));
+ * 
+ *         if (hasChildren && directoryLevel < MAX_DIRECTORY_LEVEL) {
+ *             printDirectory(rowIndex, directoryLevel + 1, indent + "    ");
+ *         }
+ *     }
+ * }
+ * 
+ * print("Scripts:");
+ * printDirectory(null, 0, "");  // null index for the root directory.
  */
 class ScriptsModel : public QAbstractItemModel {
     Q_OBJECT
@@ -79,56 +125,25 @@ public:
     ScriptsModel(QObject* parent = NULL);
     ~ScriptsModel();
 
-    /**jsdoc
-     * @function ScriptsModel.index
-     * @param {number} row
-     * @param {number} column
-     * @param {QModelIndex} parent
-     * @returns {QModelIndex}
-     */
+    // No JSDoc because the particulars of the parent class is provided in the @class description.
     QModelIndex index(int row, int column, const QModelIndex& parent) const override;
 
-    /**jsdoc
-     * @function ScriptsModel.parent
-     * @param {QModelIndex} child
-     * @returns {QModelIndex}
-     */
+    // No JSDoc because the particulars of the parent class is provided in the @class description.
     QModelIndex parent(const QModelIndex& child) const override;
 
-    /**jsdoc
-     * @function ScriptsModel.data
-     * @param {QModelIndex} index
-     * @param {number} [role=0]
-     * returns {string}
-     */
+    // No JSDoc because the particulars of the parent class is provided in the @class description.
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-    /**jsdoc
-     * @function ScriptsModel.rowCount
-     * @param {QmodelIndex} [parent=null]
-     * @returns {number}
-     */
+    // No JSDoc because the particulars of the parent class is provided in the @class description.
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    /**jsdoc
-     * @function ScriptsModel.columnCount
-     * @param {QmodelIndex} [parent=null]
-     * @returns {number}
-     */
+    // No JSDoc because the particulars of the parent class is provided in the @class description.
     int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    /**jsdoc
-     * @function ScriptsModel.getTreeNodeFromIndex
-     * @param {QmodelIndex} index
-     * @returns {TreeNodeBase}
-     */
+    // Not exposed in the API because no conversion between TreeNodeBase and QScriptValue is provided.
     TreeNodeBase* getTreeNodeFromIndex(const QModelIndex& index) const;
 
-    /**jsdoc
-     * @function ScriptsModel.getFolderNodes
-     * @param {TreeNodeFolder} parent
-     * @returns {TreeNodeBase[]}
-     */
+    // Not exposed in the API because no conversion between TreeNodeBase and QScriptValue is provided.
     QList<TreeNodeBase*> getFolderNodes(TreeNodeFolder* parent) const;
 
     enum Role {
@@ -136,9 +151,30 @@ public:
     };
 
 protected slots:
+
+    /**jsdoc
+     * @function ScriptsModel.updateScriptsLocation
+     * @param {string} newPath - New path.
+     * @deprecated This method is deprecated and will be removed from the API.
+     */
     void updateScriptsLocation(const QString& newPath);
+
+    /**jsdoc
+     * @function ScriptsModel.downloadFinished
+     * @deprecated This method is deprecated and will be removed from the API.
+     */
     void downloadFinished();
+
+    /**jsdoc
+     * @function ScriptsModel.reloadLocalFiles
+     * @deprecated This method is deprecated and will be removed from the API.
+     */
     void reloadLocalFiles();
+
+    /**jsdoc
+     * @function ScriptsModel.reloadDefaultFiles
+     * @deprecated This method is deprecated and will be removed from the API.
+     */
     void reloadDefaultFiles();
 
 protected:
diff --git a/libraries/script-engine/src/ScriptsModelFilter.h b/libraries/script-engine/src/ScriptsModelFilter.h
index 81ae4c1226..eb7495e7d4 100644
--- a/libraries/script-engine/src/ScriptsModelFilter.h
+++ b/libraries/script-engine/src/ScriptsModelFilter.h
@@ -16,14 +16,60 @@
 #include <QSortFilterProxyModel>
 
 /**jsdoc
- * <p>Provided as a property of {@link ScriptDiscoveryService}.</p>
- * <p>Has properties and functions per <a href="http://doc.qt.io/qt-5/qsortfilterproxymodel.html">
- * http://doc.qt.io/qt-5/qsortfilterproxymodel.html</a>.</p>
+ * Sorted and filtered information on the scripts that are in the default scripts directory of the Interface installation. This 
+ * is provided as a property of {@link ScriptDiscoveryService}.
+ *
+ * <p>The information provided reflects the subdirectory structure. Properties, methods, and signals are per QT's
+ * <a href="https://doc.qt.io/qt-5/qsortfilterproxymodel.html">QSortFilterProxyModel</a> class, with the following details:</p>
+ * <ul>
+ *   <li>The rows are sorted per directory and file names.</li>
+ *   <li>A single column of data: <code>columnCount(index)</code> returns <code>1</code>. </li>
+ *   <li>Data is provided for the following roles:
+ *     <table>
+ *       <thead>
+ *         <tr><th>Role</th><th>Value</th><th>Description</th></tr>
+ *       </thead>
+ *       <tbody>
+ *         <tr><td>Display</td><td><code>0</code></td><td>The directory or script file name.</td></tr>
+ *         <tr><td>Path</td><td><code>256</code></td><td>The path and filename of the data item if it is a script,
+ *         <code>undefined</code> if it is a directory.</td></tr>
+ *       </tbody>
+ *     </table>
+ *   </li>
+ *   <li>Use <code>null</code> for the root directory's index.</li>
+ * </ul>
+ *
  * @class ScriptsModelFilter
+ * @hideconstructor
  *
  * @hifi-interface
  * @hifi-client-entity
  * @hifi-avatar
+ *
+ * @example <caption>List all scripts that include "edit" in their name.</caption>
+ * var DISPLAY_ROLE = 0;
+ * var PATH_ROLE = 256;
+ * 
+ * function printDirectory(parentIndex, directoryLevel, indent) {
+ *     var numRows = ScriptDiscoveryService.scriptsModelFilter.rowCount(parentIndex);
+ *     for (var i = 0; i < numRows; i++) {
+ *         var rowIndex = ScriptDiscoveryService.scriptsModelFilter.index(i, 0, parentIndex);
+ * 
+ *         var name = ScriptDiscoveryService.scriptsModelFilter.data(rowIndex, DISPLAY_ROLE);
+ *         var hasChildren = ScriptDiscoveryService.scriptsModelFilter.hasChildren(rowIndex);
+ *         var path = hasChildren ? "" : ScriptDiscoveryService.scriptsModelFilter.data(rowIndex, PATH_ROLE);
+ * 
+ *         print(indent + "- " + name + (hasChildren ? "" : " - " + path));
+ * 
+ *         if (hasChildren) {
+ *             printDirectory(rowIndex, directoryLevel + 1, indent + "    ");
+ *         }
+ *     }
+ * }
+ * 
+ * ScriptDiscoveryService.scriptsModelFilter.filterRegExp = new RegExp("^.*edit.*$", "i");  // Set the filter.
+ * print("Edit scripts:");
+ * printDirectory(null, 0, "");  // null index for the root directory.
  */
 class ScriptsModelFilter : public QSortFilterProxyModel {
     Q_OBJECT
diff --git a/libraries/shaders/src/shaders/Shaders.cpp b/libraries/shaders/src/shaders/Shaders.cpp
index ef67842f84..9964b1a1ed 100644
--- a/libraries/shaders/src/shaders/Shaders.cpp
+++ b/libraries/shaders/src/shaders/Shaders.cpp
@@ -35,7 +35,7 @@ namespace shader {
 const Dialect DEFAULT_DIALECT = Dialect::glsl310es;
 
 const std::vector<Dialect>& allDialects() {
-    static const std::vector<Dialect> ALL_DIALECTS{ { Dialect::glsl310es } };
+    static const std::vector<Dialect> ALL_DIALECTS{ Dialect::glsl310es };
     return ALL_DIALECTS;
 }
     
diff --git a/libraries/shared/src/CrashAnnotations.cpp b/libraries/shared/src/CrashAnnotations.cpp
new file mode 100644
index 0000000000..074b467244
--- /dev/null
+++ b/libraries/shared/src/CrashAnnotations.cpp
@@ -0,0 +1,27 @@
+//
+//  CrashAnnotations.cpp
+//  libraries/shared/src
+//
+//  Created by Clement Brisset on 9/26/19.
+//  Copyright 2019 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 "SharedUtil.h"
+
+// Global variables specifically tuned to work with ptrace module for crash collection
+// Do not move/rename unless you update the ptrace module with it.
+bool crash_annotation_isShuttingDown = false;
+
+namespace crash {
+namespace annotations {
+
+void setShutdownState(bool isShuttingDown) {
+    crash_annotation_isShuttingDown = isShuttingDown;
+}
+
+
+};
+};
diff --git a/libraries/shared/src/CrashAnnotations.h b/libraries/shared/src/CrashAnnotations.h
new file mode 100644
index 0000000000..697d821335
--- /dev/null
+++ b/libraries/shared/src/CrashAnnotations.h
@@ -0,0 +1,23 @@
+//
+//  CrashAnnotations.h
+//  libraries/shared/src
+//
+//  Created by Clement Brisset on 9/26/19.
+//  Copyright 2019 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_CrashAnnotations_h
+#define hifi_CrashAnnotations_h
+
+namespace crash {
+namespace annotations {
+
+void setShutdownState(bool isShuttingDown);
+
+};
+};
+
+#endif // hifi_CrashAnnotations_h
diff --git a/libraries/shared/src/DebugDraw.cpp b/libraries/shared/src/DebugDraw.cpp
index 1b2418f7c7..2539a43672 100644
--- a/libraries/shared/src/DebugDraw.cpp
+++ b/libraries/shared/src/DebugDraw.cpp
@@ -31,9 +31,10 @@ void DebugDraw::drawRay(const glm::vec3& start, const glm::vec3& end, const glm:
     _rays.push_back(Ray(start, end, color));
 }
 
-void DebugDraw::addMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position, const glm::vec4& color) {
+void DebugDraw::addMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position,
+                          const glm::vec4& color, float size) {
     Lock lock(_mapMutex);
-    _markers[key] = MarkerInfo(rotation, position, color);
+    _markers[key] = MarkerInfo(rotation, position, color, size);
 }
 
 void DebugDraw::removeMarker(const QString& key) {
@@ -41,9 +42,10 @@ void DebugDraw::removeMarker(const QString& key) {
     _markers.erase(key);
 }
 
-void DebugDraw::addMyAvatarMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position, const glm::vec4& color) {
+void DebugDraw::addMyAvatarMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position,
+                                  const glm::vec4& color, float size) {
     Lock lock(_mapMutex);
-    _myAvatarMarkers[key] = MarkerInfo(rotation, position, color);
+    _myAvatarMarkers[key] = MarkerInfo(rotation, position, color, size);
 }
 
 void DebugDraw::removeMyAvatarMarker(const QString& key) {
@@ -83,4 +85,4 @@ void DebugDraw::drawRays(const std::vector<std::pair<glm::vec3, glm::vec3>>& lin
         auto point2 = translation + rotation * line.second;
         _rays.push_back(Ray(point1, point2, color));
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/shared/src/DebugDraw.h b/libraries/shared/src/DebugDraw.h
index 9e3140ca9b..9db48b759b 100644
--- a/libraries/shared/src/DebugDraw.h
+++ b/libraries/shared/src/DebugDraw.h
@@ -95,19 +95,22 @@ public:
      * @param {Quat} rotation - The orientation of the marker in world coordinates.
      * @param {Vec3} position - The position of the market in world coordinates.
      * @param {Vec4} color - The color of the marker.
+     * @param {float} size - A float between 0.0 and 1.0 (10 cm) to control the size of the marker.
      * @example <caption>Briefly draw a debug marker in front of your avatar, in world coordinates.</caption>
      * var MARKER_NAME = "my marker";
      * DebugDraw.addMarker(
      *     MARKER_NAME,
      *     Quat.ZERO,
      *     Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0, z: -5})),
-     *     { red: 255, green: 0, blue: 0 }
+     *     { red: 255, green: 0, blue: 0 },
+     *     1.0
      * );
      * Script.setTimeout(function () {
      *     DebugDraw.removeMarker(MARKER_NAME);
      * }, 5000);
      */
-    Q_INVOKABLE void addMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position, const glm::vec4& color);
+    Q_INVOKABLE void addMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position,
+                               const glm::vec4& color, float size = 1.0f);
 
     /**jsdoc
      * Removes a debug marker that was added in world coordinates.
@@ -125,19 +128,22 @@ public:
      * @param {Quat} rotation - The orientation of the marker in avatar coordinates.
      * @param {Vec3} position - The position of the market in avatar coordinates.
      * @param {Vec4} color - color of the marker.
+     * @param {float} size - A float between 0.0 and 1.0 (10 cm) to control the size of the marker.
      * @example <caption>Briefly draw a debug marker in front of your avatar, in avatar coordinates.</caption>
      * var MARKER_NAME = "My avatar marker";
      * DebugDraw.addMyAvatarMarker(
      *     MARKER_NAME,
      *     Quat.ZERO,
      *     { x: 0, y: 0, z: -5 },
-     *     { red: 255, green: 0, blue: 0 }
+     *     { red: 255, green: 0, blue: 0 },
+     *     1.0
      * );
      * Script.setTimeout(function () {
      *     DebugDraw.removeMyAvatarMarker(MARKER_NAME);
      * }, 5000);
      */
-    Q_INVOKABLE void addMyAvatarMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position, const glm::vec4& color);
+    Q_INVOKABLE void addMyAvatarMarker(const QString& key, const glm::quat& rotation, const glm::vec3& position,
+                                       const glm::vec4& color, float size = 1.0f);
 
     /**jsdoc
      * Removes a debug marker that was added in avatar coordinates.
@@ -146,7 +152,7 @@ public:
      */
     Q_INVOKABLE void removeMyAvatarMarker(const QString& key);
 
-    using MarkerInfo = std::tuple<glm::quat, glm::vec3, glm::vec4>;
+    using MarkerInfo = std::tuple<glm::quat, glm::vec3, glm::vec4, float>;
     using MarkerMap = std::map<QString, MarkerInfo>;
     using Ray = std::tuple<glm::vec3, glm::vec3, glm::vec4>;
     using Rays = std::vector<Ray>;
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index 6deae695cd..cfb4bb6398 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -14,6 +14,8 @@
 
 #include <stdint.h>
 
+#include <array>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/quaternion.hpp>
@@ -364,4 +366,30 @@ inline int fastLrintf(float x) {
 #endif
 }
 
+// returns the FOV from the projection matrix
+inline glm::vec4 extractFov( const glm::mat4& m) {
+    static const std::array<glm::vec4, 4> CLIPS{ {
+                                                { 1, 0, 0, 1 },
+                                                { -1, 0, 0, 1 },
+                                                { 0, 1, 0, 1 },
+                                                { 0, -1, 0, 1 }
+                                            } };
+
+    glm::mat4 mt = glm::transpose(m);
+    glm::vec4 v, result;
+    // Left
+    v = mt * CLIPS[0];
+    result.x = -atanf(v.z / v.x);
+    // Right
+    v = mt * CLIPS[1];
+    result.y = atanf(v.z / v.x);
+    // Down
+    v = mt * CLIPS[2];
+    result.z = -atanf(v.z / v.y);
+    // Up
+    v = mt * CLIPS[3];
+    result.w = atanf(v.z / v.y);
+    return result;
+}
+
 #endif // hifi_GLMHelpers_h
diff --git a/libraries/shared/src/GeometryUtil.cpp b/libraries/shared/src/GeometryUtil.cpp
index b6fca03403..23d2f0f71b 100644
--- a/libraries/shared/src/GeometryUtil.cpp
+++ b/libraries/shared/src/GeometryUtil.cpp
@@ -547,6 +547,28 @@ bool doLineSegmentsIntersect(glm::vec2 r1p1, glm::vec2 r1p2, glm::vec2 r2p1, glm
          (d4 == 0 && isOnSegment(r1p1.x, r1p1.y, r1p2.x, r1p2.y, r2p2.x, r2p2.y));
 }
 
+bool findClosestApproachOfLines(glm::vec3 p1, glm::vec3 d1, glm::vec3 p2, glm::vec3 d2,
+                                // return values...
+                                float& t1, float& t2) {
+    // https://math.stackexchange.com/questions/1993953/closest-points-between-two-lines/1993990#1993990
+    // https://en.wikipedia.org/wiki/Skew_lines#Nearest_Points
+    glm::vec3 n1 = glm::cross(d1, glm::cross(d2, d1));
+    glm::vec3 n2 = glm::cross(d2, glm::cross(d1, d2));
+
+    float denom1 = glm::dot(d1, n2);
+    float denom2 = glm::dot(d2, n1);
+
+    if (denom1 != 0.0f && denom2 != 0.0f) {
+        t1 = glm::dot((p2 - p1), n2) / denom1;
+        t2 = glm::dot((p1 - p2), n1) / denom2;
+        return true;
+    } else {
+        t1 = 0.0f;
+        t2 = 0.0f;
+        return false;
+    }
+}
+
 bool isOnSegment(float xi, float yi, float xj, float yj, float xk, float yk)  {
   return (xi <= xk || xj <= xk) && (xk <= xi || xk <= xj) &&
          (yi <= yk || yj <= yk) && (yk <= yi || yk <= yj);
@@ -1813,4 +1835,4 @@ bool solve_quartic(float a, float b, float c, float d, glm::vec4& roots) {
 
 bool computeRealQuarticRoots(float a, float b, float c, float d, float e, glm::vec4& roots) {
     return solve_quartic(b / a, c / a, d / a, e / a, roots);
-}
\ No newline at end of file
+}
diff --git a/libraries/shared/src/GeometryUtil.h b/libraries/shared/src/GeometryUtil.h
index 764eeb1500..d786d63980 100644
--- a/libraries/shared/src/GeometryUtil.h
+++ b/libraries/shared/src/GeometryUtil.h
@@ -150,6 +150,7 @@ int clipTriangleWithPlane(const Triangle& triangle, const Plane& plane, Triangle
 int clipTriangleWithPlanes(const Triangle& triangle, const Plane* planes, int planeCount, Triangle* clippedTriangles, int maxClippedTriangleCount);
 
 bool doLineSegmentsIntersect(glm::vec2 r1p1, glm::vec2 r1p2, glm::vec2 r2p1, glm::vec2 r2p2);
+bool findClosestApproachOfLines(glm::vec3 p1, glm::vec3 d1, glm::vec3 p2, glm::vec3 d2, float& t1, float& t2);
 bool isOnSegment(float xi, float yi, float xj, float yj, float xk, float yk);
 int computeDirection(float xi, float yi, float xj, float yj, float xk, float yk);
 
diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp
index c51d9bf611..aff4de6e3a 100644
--- a/libraries/shared/src/LogHandler.cpp
+++ b/libraries/shared/src/LogHandler.cpp
@@ -32,14 +32,6 @@ LogHandler& LogHandler::getInstance() {
     return staticInstance;
 }
 
-LogHandler::LogHandler() {
-    // make sure we setup the repeated message flusher, but do it on the LogHandler thread	
-    QMetaObject::invokeMethod(this, "setupRepeatedMessageFlusher");
-}
-
-LogHandler::~LogHandler() {
-}
-
 const char* stringForLogType(LogMsgType msgType) {
     switch (msgType) {
         case LogInfo:
diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h
index 56450768ff..8f84899b78 100644
--- a/libraries/shared/src/LogHandler.h
+++ b/libraries/shared/src/LogHandler.h
@@ -54,12 +54,11 @@ public:
     int newRepeatedMessageID();
     void printRepeatedMessage(int messageID, LogMsgType type, const QMessageLogContext& context, const QString &message);
 
-private slots:
     void setupRepeatedMessageFlusher();
 
 private:
-    LogHandler();
-    ~LogHandler();
+    LogHandler() = default;
+    ~LogHandler() = default;
 
     void flushRepeatedMessages();
 
diff --git a/libraries/shared/src/shared/Camera.cpp b/libraries/shared/src/shared/Camera.cpp
index 787b7bfb1a..b39b8b9169 100644
--- a/libraries/shared/src/shared/Camera.cpp
+++ b/libraries/shared/src/shared/Camera.cpp
@@ -35,6 +35,18 @@
  *       your avatar.</td>
  *     </tr>
  *     <tr>
+ *       <td><strong>Look&nbsp;At</strong></td>
+ *       <td><code>"look&nbsp;at"</code></td>
+ *       <td>The camera is positioned behind your avatar. The camera moves and rotates independently from your avatar.
+ *       The avatar's head always faces the camera look at point.</td>
+ *     </tr>
+ *     <tr>
+ *       <td><strong>Selfie</strong></td>
+ *       <td><code>"selfie"</code></td>
+ *       <td>The camera is positioned in front of your avatar. The camera moves and rotates independently from your avatar.
+ *       Your avatar's head is always facing the camera.</td>
+ *     </tr>
+ *     <tr>
  *       <td><strong>Mirror</strong></td>
  *       <td><code>"mirror"</code></td>
  *       <td>The camera is positioned such that you are looking directly at your avatar. The camera moves and rotates with your 
@@ -67,6 +79,10 @@ CameraMode stringToMode(const QString& mode) {
         return CAMERA_MODE_INDEPENDENT;
     } else if (mode == "entity") {
         return CAMERA_MODE_ENTITY;
+    } else if (mode == "look at") {
+        return CAMERA_MODE_LOOK_AT;
+    } else if (mode == "selfie") {
+        return CAMERA_MODE_SELFIE;
     }
     return CAMERA_MODE_NULL;
 }
@@ -82,6 +98,10 @@ QString modeToString(CameraMode mode) {
         return "independent";
     } else if (mode == CAMERA_MODE_ENTITY) {
         return "entity";
+    } else if (mode == CAMERA_MODE_LOOK_AT) {
+        return "look at";
+    } else if (mode == CAMERA_MODE_SELFIE) {
+        return "selfie";
     }
     return "unknown";
 }
diff --git a/libraries/shared/src/shared/Camera.h b/libraries/shared/src/shared/Camera.h
index 0df83cfb9a..eecad34838 100644
--- a/libraries/shared/src/shared/Camera.h
+++ b/libraries/shared/src/shared/Camera.h
@@ -23,6 +23,8 @@ enum CameraMode
     CAMERA_MODE_MIRROR,
     CAMERA_MODE_INDEPENDENT,
     CAMERA_MODE_ENTITY,
+    CAMERA_MODE_LOOK_AT,
+    CAMERA_MODE_SELFIE,
     NUM_CAMERA_MODES
 };
 
@@ -182,7 +184,7 @@ private:
     void recompose();
     void decompose();
 
-    CameraMode _mode{ CAMERA_MODE_THIRD_PERSON };
+    CameraMode _mode{ CAMERA_MODE_LOOK_AT };
     glm::mat4 _transform;
     glm::mat4 _projection;
 
diff --git a/libraries/shared/src/shared/FileLogger.cpp b/libraries/shared/src/shared/FileLogger.cpp
index b64d08c0d8..2ccc247af3 100644
--- a/libraries/shared/src/shared/FileLogger.cpp
+++ b/libraries/shared/src/shared/FileLogger.cpp
@@ -56,7 +56,6 @@ static FilePersistThread* _persistThreadInstance;
 
 QString getLogRollerFilename() {
     QString result = FileUtils::standardPath(LOGS_DIRECTORY);
-    QHostAddress clientAddress = getGuessedLocalAddress();
     QDateTime now = QDateTime::currentDateTime();
     QString fileSessionID;
 
diff --git a/libraries/shared/src/shared/LocalFileAccessGate.cpp b/libraries/shared/src/shared/LocalFileAccessGate.cpp
new file mode 100644
index 0000000000..4b57894251
--- /dev/null
+++ b/libraries/shared/src/shared/LocalFileAccessGate.cpp
@@ -0,0 +1,21 @@
+//
+//  Created by Bradley Austin Davis on 2019/09/05
+//  Copyright 2013-2019 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 "LocalFileAccessGate.h"
+
+#include <QtCore/QThreadStorage>
+
+static QThreadStorage<bool> localAccessSafe;
+
+void hifi::scripting::setLocalAccessSafeThread(bool safe) {
+    localAccessSafe.setLocalData(safe);
+}
+
+bool hifi::scripting::isLocalAccessSafeThread() {
+    return localAccessSafe.hasLocalData() && localAccessSafe.localData();
+}
diff --git a/libraries/shared/src/shared/LocalFileAccessGate.h b/libraries/shared/src/shared/LocalFileAccessGate.h
new file mode 100644
index 0000000000..7fc5563524
--- /dev/null
+++ b/libraries/shared/src/shared/LocalFileAccessGate.h
@@ -0,0 +1,21 @@
+//
+//  Created by Bradley Austin Davis on 2019/09/05
+//  Copyright 2013-2019 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
+//
+
+#pragma once
+#ifndef hifi_LocalFileAccessGate_h
+#define hifi_LocalFileAccessGate_h
+
+namespace hifi { namespace scripting {
+
+void setLocalAccessSafeThread(bool safe = true);
+
+bool isLocalAccessSafeThread();
+
+}}  // namespace hifi::scripting
+
+#endif
diff --git a/libraries/shared/src/shared/NetworkUtils.cpp b/libraries/shared/src/shared/NetworkUtils.cpp
index 50356d30fc..705eac39c9 100644
--- a/libraries/shared/src/shared/NetworkUtils.cpp
+++ b/libraries/shared/src/shared/NetworkUtils.cpp
@@ -9,9 +9,19 @@
 #include "NetworkUtils.h"
 #include <QtNetwork/QNetworkInterface>
 
+namespace {
+    const QString LINK_LOCAL_SUBNET {"169.254."};
+
+    // Is address local-subnet valid only (rfc 3927):
+    bool isLinkLocalAddress(const QHostAddress& ip4Addr) {
+        return ip4Addr.toString().startsWith(LINK_LOCAL_SUBNET);
+    }
+}
+
 QHostAddress getGuessedLocalAddress() {
 
     QHostAddress localAddress;
+    QHostAddress linkLocalAddress;
 
     foreach(const QNetworkInterface &networkInterface, QNetworkInterface::allInterfaces()) {
         if (networkInterface.flags() & QNetworkInterface::IsUp
@@ -20,12 +30,16 @@ QHostAddress getGuessedLocalAddress() {
             // we've decided that this is the active NIC
             // enumerate it's addresses to grab the IPv4 address
             foreach(const QNetworkAddressEntry &entry, networkInterface.addressEntries()) {
+                const auto& addressCandidate = entry.ip();
                 // make sure it's an IPv4 address that isn't the loopback
-                if (entry.ip().protocol() == QAbstractSocket::IPv4Protocol && !entry.ip().isLoopback()) {
-
-                    // set our localAddress and break out
-                    localAddress = entry.ip();
-                    break;
+                if (addressCandidate.protocol() == QAbstractSocket::IPv4Protocol && !addressCandidate.isLoopback()) {
+                    if (isLinkLocalAddress(addressCandidate)) {
+                        linkLocalAddress = addressCandidate;  // Last resort
+                    } else {
+                        // set our localAddress and break out
+                        localAddress = addressCandidate;
+                        break;
+                    }
                 }
             }
         }
@@ -36,7 +50,5 @@ QHostAddress getGuessedLocalAddress() {
     }
 
     // return the looked up local address
-    return localAddress;
+    return localAddress.isNull() ? linkLocalAddress : localAddress;
 }
-
-
diff --git a/libraries/shared/src/shared/PlatformHelper.cpp b/libraries/shared/src/shared/PlatformHelper.cpp
new file mode 100644
index 0000000000..51c282a9f8
--- /dev/null
+++ b/libraries/shared/src/shared/PlatformHelper.cpp
@@ -0,0 +1,31 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Copyright 2013-2019 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 "PlatformHelper.h"
+
+void PlatformHelper::onSleep() {
+    if (_awake.exchange(false)) {
+        qInfo() << "Entering sleep or hibernation.";
+        emit systemWillSleep();
+    }
+}
+
+void PlatformHelper::onWake() {
+    if (!_awake.exchange(true)) {
+        qInfo() << "Waking up from sleep or hibernation.";
+        emit systemWillWake();
+    }
+}
+
+void PlatformHelper::shutdown() {
+    DependencyManager::destroy<PlatformHelper>();
+}
+
+PlatformHelper* PlatformHelper::instance() {
+    return DependencyManager::get<PlatformHelper>().get();
+}
+
diff --git a/libraries/shared/src/shared/PlatformHelper.h b/libraries/shared/src/shared/PlatformHelper.h
new file mode 100644
index 0000000000..760eb7bd42
--- /dev/null
+++ b/libraries/shared/src/shared/PlatformHelper.h
@@ -0,0 +1,43 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Copyright 2013-2019 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
+//
+
+#pragma once
+#ifndef hifi_shared_PlatformHelper_h
+#define hifi_shared_PlatformHelper_h
+
+#include <atomic>
+#include <QtCore/QtGlobal>
+#include "../DependencyManager.h"
+
+class PlatformHelper : public QObject, public Dependency {
+    Q_OBJECT
+public:
+    PlatformHelper() {}
+    virtual ~PlatformHelper() {}
+
+    void onSleep();
+    void onWake();
+
+signals:
+    void systemWillSleep();
+    void systemWillWake();
+
+public:
+    // Run the per-platform code to instantiate a platform-dependent PlatformHelper dependency object
+    static void setup();
+    // Run the per-platform code to cleanly shutdown a platform-dependent PlatformHelper dependency object
+    static void shutdown();
+    // Fetch the platform specific instance of the helper
+    static PlatformHelper* instance();
+    
+    std::atomic<bool> _awake{ true };
+};
+
+
+
+#endif
diff --git a/libraries/shared/src/shared/ScriptInitializerMixin.h b/libraries/shared/src/shared/ScriptInitializerMixin.h
index 50de553b0b..cefa33c2d3 100644
--- a/libraries/shared/src/shared/ScriptInitializerMixin.h
+++ b/libraries/shared/src/shared/ScriptInitializerMixin.h
@@ -9,30 +9,38 @@
 #pragma once
 
 #include <functional>
+#include <mutex>
 #include <QSharedPointer>
 #include "../DependencyManager.h"
 
 class QScriptEngine;
 class ScriptEngine;
 
-class ScriptInitializerMixin : public QObject, public Dependency {
-    Q_OBJECT
+template <typename T> class ScriptInitializerMixin {
+public:
+    using ScriptInitializer = std::function<void(T)>;
+    virtual void registerScriptInitializer(ScriptInitializer initializer) {
+        InitializerLock lock(_scriptInitializerMutex);
+        _scriptInitializers.push_back(initializer);
+    }
+    virtual int runScriptInitializers(T engine) {
+        InitializerLock lock(_scriptInitializerMutex);
+        return std::count_if(_scriptInitializers.begin(), _scriptInitializers.end(),
+            [engine](auto initializer){ initializer(engine); return true; }
+        );
+    }
+    virtual ~ScriptInitializerMixin() {}
+protected:
+    std::mutex _scriptInitializerMutex;
+    using InitializerLock = std::lock_guard<std::mutex>;
+    std::list<ScriptInitializer> _scriptInitializers;
+};
+
+class ScriptInitializers : public ScriptInitializerMixin<QScriptEngine*>, public Dependency {
 public:
     // Lightweight `QScriptEngine*` initializer (only depends on built-in Qt components)
     // example registration:
-    // eg: [&](QScriptEngine* engine) -> bool {
+    // eg: [&](QScriptEngine* engine) {
     //     engine->globalObject().setProperties("API", engine->newQObject(...instance...))
-    //     return true;
-    // }
-    using NativeScriptInitializer = std::function<void(QScriptEngine*)>;
-    virtual bool registerNativeScriptInitializer(NativeScriptInitializer initializer) = 0;
-
-    // Heavyweight `ScriptEngine*` initializer (tightly coupled to Interface and script-engine library internals)
-    // eg: [&](ScriptEnginePointer scriptEngine) -> bool {
-    //     engine->registerGlobalObject("API", ...instance..);
-    //     return true;
-    // }
-    using ScriptEnginePointer = QSharedPointer<ScriptEngine>;
-    using ScriptInitializer = std::function<void(ScriptEnginePointer)>;
-    virtual bool registerScriptInitializer(ScriptInitializer initializer) { return false; };
+    // };
 };
diff --git a/libraries/shared/src/shared/platform/AndroidHelper.cpp b/libraries/shared/src/shared/platform/AndroidHelper.cpp
new file mode 100644
index 0000000000..5194264e9e
--- /dev/null
+++ b/libraries/shared/src/shared/platform/AndroidHelper.cpp
@@ -0,0 +1,27 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Copyright 2013-2019 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 "../PlatformHelper.h"
+
+#if defined(Q_OS_ANDROID)
+
+// FIXME support sleep/wake notifications
+class AndroidHelper : public PlatformHelper {
+public:
+    AndroidHelper() {
+    }
+
+    ~AndroidHelper() {
+    }
+};
+
+void PlatformHelper::setup() {
+    DependencyManager::set<PlatformHelper, AndroidHelper>();
+}
+
+#endif
diff --git a/libraries/shared/src/shared/platform/LinuxHelper.cpp b/libraries/shared/src/shared/platform/LinuxHelper.cpp
new file mode 100644
index 0000000000..2bbdde5698
--- /dev/null
+++ b/libraries/shared/src/shared/platform/LinuxHelper.cpp
@@ -0,0 +1,27 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Copyright 2013-2019 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 "../PlatformHelper.h"
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
+
+// FIXME support sleep/wake notifications
+class LinuxHelper : public PlatformHelper {
+public:
+    LinuxHelper() {
+    }
+
+    ~LinuxHelper() {
+    }
+};
+
+void PlatformHelper::setup() {
+    DependencyManager::set<PlatformHelper, LinuxHelper>();
+}
+
+#endif
diff --git a/libraries/shared/src/shared/platform/MacHelper.cpp b/libraries/shared/src/shared/platform/MacHelper.cpp
new file mode 100644
index 0000000000..453dcc2760
--- /dev/null
+++ b/libraries/shared/src/shared/platform/MacHelper.cpp
@@ -0,0 +1,70 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Based on interface/src/MacHelper.cpp, created by Howard Stearns
+//  Copyright 2013-2019 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 "../PlatformHelper.h"
+
+#if defined(Q_OS_MAC)
+#include <IOKit/IOMessage.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+
+class MacHelper : public PlatformHelper {
+public:
+    MacHelper() {
+        _rootPort = IORegisterForSystemPower(this, &_notifyPortRef, serviceInterestCallback, &_notifierObject);
+        if (_rootPort == 0) {
+            qWarning() << "IORegisterForSystemPower failed";
+            return;
+        }
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(_notifyPortRef), kCFRunLoopCommonModes);
+    }
+
+    ~MacHelper() {
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(_notifyPortRef), kCFRunLoopCommonModes);
+        IODeregisterForSystemPower(&_notifierObject);
+        IOServiceClose(_rootPort);
+        IONotificationPortDestroy(_notifyPortRef);
+    }
+
+private:
+    void onServiceMessage(io_service_t, natural_t messageType, void* messageArgument) {
+        switch (messageType) {
+            case kIOMessageSystemHasPoweredOn:
+                onWake();
+                break;
+
+            case kIOMessageSystemWillSleep:
+                onSleep();
+                // explicit fallthrough
+
+            // Per the documentation for kIOMessageSystemWillSleep and kIOMessageCanSystemSleep, the receiver MUST respond
+            // https://developer.apple.com/documentation/iokit/1557114-ioregisterforsystempower?language=objc
+            case kIOMessageCanSystemSleep:
+                IOAllowPowerChange(_rootPort, (long)messageArgument);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    static void serviceInterestCallback(void* refCon, io_service_t service, natural_t messageType, void* messageArgument) {
+        static_cast<MacHelper*>(refCon)->onServiceMessage(service, messageType, messageArgument);
+    }
+
+    io_connect_t _rootPort{ 0 };
+    IONotificationPortRef _notifyPortRef{};
+    io_object_t _notifierObject{};
+};
+
+void PlatformHelper::setup() {
+    DependencyManager::set<PlatformHelper, MacHelper>();
+}
+
+#endif
+
diff --git a/libraries/shared/src/shared/platform/WinHelper.cpp b/libraries/shared/src/shared/platform/WinHelper.cpp
new file mode 100644
index 0000000000..3de82af087
--- /dev/null
+++ b/libraries/shared/src/shared/platform/WinHelper.cpp
@@ -0,0 +1,52 @@
+//
+//  Created by Bradley Austin Davis on 2019/08/22
+//  Copyright 2013-2019 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 "../PlatformHelper.h"
+
+#if !defined(Q_OS_ANDROID) && defined(Q_OS_WIN)
+
+#include <QtCore/QAbstractNativeEventFilter>
+#include <QtCore/QAbstractEventDispatcher>
+#include <Windows.h>
+
+class WinHelper : public PlatformHelper, public QAbstractNativeEventFilter {
+public:
+    WinHelper() {
+        QAbstractEventDispatcher::instance()->installNativeEventFilter(this);
+    }
+
+    ~WinHelper() {
+        auto eventDispatcher = QAbstractEventDispatcher::instance();
+        if (eventDispatcher) {
+            eventDispatcher->removeNativeEventFilter(this);
+        }
+    }
+
+    bool nativeEventFilter(const QByteArray& eventType, void* message, long*) override {
+        MSG* msg = static_cast<MSG*>(message);
+        if (msg->message == WM_POWERBROADCAST) {
+            switch (msg->wParam) {
+                case PBT_APMRESUMEAUTOMATIC:
+                case PBT_APMRESUMESUSPEND:
+                    onWake();
+                    break;
+
+                case PBT_APMSUSPEND:
+                    onSleep();
+                    break;
+            }
+        }
+        return false;
+    }
+};
+
+void PlatformHelper::setup() {
+    DependencyManager::set<PlatformHelper, WinHelper>();
+}
+
+#endif
diff --git a/libraries/task/src/task/Config.h b/libraries/task/src/task/Config.h
index 8accba9e1f..71d48c9a18 100644
--- a/libraries/task/src/task/Config.h
+++ b/libraries/task/src/task/Config.h
@@ -90,6 +90,17 @@ public:
     using Config = JobConfig;
 };
 
+/**jsdoc
+ * @namespace Workload
+ *
+ * @hifi-interface
+ * @hifi-client-entity
+ * @hifi-avatar
+ *
+ * @property {number} cpuRunTime - <em>Read-only.</em>
+ * @property {boolean} enabled
+ * @property {number} branch
+ */
 // A default Config is always on; to create an enableable Config, use the ctor JobConfig(bool enabled)
 class JobConfig : public QObject {
     Q_OBJECT
@@ -139,7 +150,7 @@ public:
     double getCPURunTime() const { return _msCPURunTime; }
 
     /**jsdoc
-     * @function Render.getConfig
+     * @function Workload.getConfig
      * @param {string} name
      * @returns {object}
      */
@@ -162,19 +173,19 @@ public:
 
     // Describe the node graph data connections of the associated Job/Task
    /**jsdoc
-    * @function JobConfig.isTask
+    * @function Workload.isTask
     * @returns {boolean}
     */
     Q_INVOKABLE bool isTask() const { return _isTask; }
 
     /**jsdoc
-     * @function JobConfig.isSwitch
+     * @function Workload.isSwitch
      * @returns {boolean}
      */
     Q_INVOKABLE bool isSwitch() const { return _isSwitch; }
 
     /**jsdoc
-     * @function JobConfig.getSubConfigs
+     * @function Workload.getSubConfigs
      * @returns {object[]}
      */
     Q_INVOKABLE QObjectList getSubConfigs() const {
@@ -187,13 +198,13 @@ public:
     }
 
     /**jsdoc
-     * @function JobConfig.getNumSubs
+     * @function Workload.getNumSubs
      * @returns {number}
      */
     Q_INVOKABLE int getNumSubs() const { return getSubConfigs().size(); }
 
     /**jsdoc
-     * @function JobConfig.getSubConfig
+     * @function Workload.getSubConfig
      * @param {number} index
      * @returns {object}
      */
@@ -214,7 +225,7 @@ public slots:
 
     /**jsdoc
      * @function Workload.load
-     * @param {object} map
+     * @param {object} json
      */
     void load(const QJsonObject& val) { qObjectFromJsonValue(val, *this); emit loaded(); }
 
diff --git a/libraries/trackers/src/trackers/EyeTracker.cpp b/libraries/trackers/src/trackers/EyeTracker.cpp
deleted file mode 100644
index a64b945c55..0000000000
--- a/libraries/trackers/src/trackers/EyeTracker.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-//
-//  Created by David Rowe on 27 Jul 2015.
-//  Copyright 2015 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 "EyeTracker.h"
-
-#include <QFuture>
-#include <QtConcurrent/QtConcurrentRun>
-
-#include <SharedUtil.h>
-
-#include "Logging.h"
-#include <OctreeConstants.h>
-
-#ifdef HAVE_IVIEWHMD
-char* HIGH_FIDELITY_EYE_TRACKER_CALIBRATION = "HighFidelityEyeTrackerCalibration";
-#endif
-
-#ifdef HAVE_IVIEWHMD
-static void CALLBACK eyeTrackerCallback(smi_CallbackDataStruct* data) {
-    auto eyeTracker = DependencyManager::get<EyeTracker>();
-    if (eyeTracker) {  // Guard against a few callbacks that continue to be received after smi_quit().
-        eyeTracker->processData(data);
-    }
-}
-#endif
-
-EyeTracker::~EyeTracker() {
-#ifdef HAVE_IVIEWHMD
-    if (_isStreaming) {
-        int result = smi_quit();
-        if (result != SMI_RET_SUCCESS) {
-            qCWarning(interfaceapp) << "Eye Tracker: Error terminating tracking:" << smiReturnValueToString(result);
-        }
-    }
-#endif
-}
-
-#ifdef HAVE_IVIEWHMD
-void EyeTracker::processData(smi_CallbackDataStruct* data) {
-    _lastProcessDataTimestamp = usecTimestampNow();
-
-    if (!_isEnabled) {
-        return;
-    }
-
-    if (data->type == SMI_SIMPLE_GAZE_SAMPLE) {
-        // Calculate the intersections of the left and right eye look-at vectors with a vertical plane along the monocular
-        // gaze direction. Average these positions to give the look-at point.
-        // If the eyes are parallel or diverged, gaze at a distant look-at point calculated the same as for non eye tracking.
-        // Line-plane intersection: https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection
-
-        smi_SampleHMDStruct* sample = (smi_SampleHMDStruct*)data->result;
-        // The iViewHMD coordinate system has x and z axes reversed compared to Interface, i.e., wearing the HMD:
-        // - x is left
-        // - y is up
-        // - z is forwards
-
-        // Plane
-        smi_Vec3d point = sample->gazeBasePoint;  // mm
-        smi_Vec3d direction = sample->gazeDirection;
-        glm::vec3 planePoint = glm::vec3(-point.x, point.y, -point.z) / 1000.0f;
-        glm::vec3 planeNormal = glm::vec3(-direction.z, 0.0f, direction.x);
-        glm::vec3 monocularDirection = glm::vec3(-direction.x, direction.y, -direction.z);
-
-        // Left eye
-        point = sample->left.gazeBasePoint;  // mm
-        direction = sample->left.gazeDirection;
-        glm::vec3 leftLinePoint = glm::vec3(-point.x, point.y, -point.z) / 1000.0f;
-        glm::vec3 leftLineDirection = glm::vec3(-direction.x, direction.y, -direction.z);
-
-        // Right eye
-        point = sample->right.gazeBasePoint;  // mm
-        direction = sample->right.gazeDirection;
-        glm::vec3 rightLinePoint = glm::vec3(-point.x, point.y, -point.z) / 1000.0f;
-        glm::vec3 rightLineDirection = glm::vec3(-direction.x, direction.y, -direction.z);
-
-        // Plane - line dot products
-        float leftLinePlaneDotProduct = glm::dot(leftLineDirection, planeNormal);
-        float rightLinePlaneDotProduct = glm::dot(rightLineDirection, planeNormal);
-
-        // Gaze into distance if eyes are parallel or diverged; otherwise the look-at is the average of look-at points
-        glm::vec3 lookAtPosition;
-        if (abs(leftLinePlaneDotProduct) <= FLT_EPSILON || abs(rightLinePlaneDotProduct) <= FLT_EPSILON) {
-            lookAtPosition = monocularDirection * (float)TREE_SCALE;
-        } else {
-            float leftDistance = glm::dot(planePoint - leftLinePoint, planeNormal) / leftLinePlaneDotProduct;
-            float rightDistance = glm::dot(planePoint - rightLinePoint, planeNormal) / rightLinePlaneDotProduct;
-            if (leftDistance <= 0.0f || rightDistance <= 0.0f 
-                || leftDistance > (float)TREE_SCALE || rightDistance > (float)TREE_SCALE) {
-                lookAtPosition = monocularDirection * (float)TREE_SCALE;
-            } else {
-                glm::vec3 leftIntersectionPoint = leftLinePoint + leftDistance * leftLineDirection;
-                glm::vec3 rightIntersectionPoint = rightLinePoint + rightDistance * rightLineDirection;
-                lookAtPosition = (leftIntersectionPoint + rightIntersectionPoint) / 2.0f;
-            }
-        }
-
-        if (glm::isnan(lookAtPosition.x) || glm::isnan(lookAtPosition.y) || glm::isnan(lookAtPosition.z)) {
-            return;
-        }
-
-        _lookAtPosition = lookAtPosition;
-    }
-}
-#endif
-
-void EyeTracker::init() {
-    if (_isInitialized) {
-        qCWarning(trackers) << "Eye Tracker: Already initialized";
-        return;
-    }
-}
-
-#ifdef HAVE_IVIEWHMD
-int EyeTracker::startStreaming(bool simulate) {
-    return smi_startStreaming(simulate);  // This call blocks execution.
-}
-#endif
-
-#ifdef HAVE_IVIEWHMD
-void EyeTracker::onStreamStarted() {
-    if (!_isInitialized) {
-        return;
-    }
-
-    int result = _startStreamingWatcher.result();
-    _isStreaming = (result == SMI_RET_SUCCESS);
-
-    if (result != SMI_RET_SUCCESS) {
-        qCWarning(interfaceapp) << "Eye Tracker: Error starting streaming:" << smiReturnValueToString(result);
-        // Display error dialog unless SMI SDK has already displayed an error message.
-        if (result != SMI_ERROR_HMD_NOT_SUPPORTED) {
-            OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
-        }
-    } else {
-        qCDebug(interfaceapp) << "Eye Tracker: Started streaming";
-    }
-
-    if (_isStreaming) {
-       // Automatically load calibration if one has been saved.
-       QString availableCalibrations = QString(smi_getAvailableCalibrations());
-       if (availableCalibrations.contains(HIGH_FIDELITY_EYE_TRACKER_CALIBRATION)) {
-           result = smi_loadCalibration(HIGH_FIDELITY_EYE_TRACKER_CALIBRATION);
-           if (result != SMI_RET_SUCCESS) {
-               qCWarning(interfaceapp) << "Eye Tracker: Error loading calibration:" << smiReturnValueToString(result);
-               OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", "Error loading calibration"
-                   + smiReturnValueToString(result));
-           } else {
-               qCDebug(interfaceapp) << "Eye Tracker: Loaded calibration";
-           }
-       }
-    }
-}
-#endif
-
-void EyeTracker::setEnabled(bool enabled, bool simulate) {
-    if (enabled && !_isInitialized) {
-#ifdef HAVE_IVIEWHMD
-        int result = smi_setCallback(eyeTrackerCallback);
-        if (result != SMI_RET_SUCCESS) {
-            qCWarning(interfaceapp) << "Eye Tracker: Error setting callback:" << smiReturnValueToString(result);
-            OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
-        } else {
-            _isInitialized = true;
-        }
-
-        connect(&_startStreamingWatcher, SIGNAL(finished()), this, SLOT(onStreamStarted()));
-#endif
-    }
-
-    if (!_isInitialized) {
-        return;
-    }
-
-#ifdef HAVE_IVIEWHMD
-    qCDebug(interfaceapp) << "Eye Tracker: Set enabled =" << enabled << ", simulate =" << simulate;
-
-    // There is no smi_stopStreaming() method and after an smi_quit(), streaming cannot be restarted (at least not for 
-    // simulated data). So keep streaming once started in case tracking is re-enabled after stopping.
-
-    // Try to stop streaming if changing whether simulating or not.
-    if (enabled && _isStreaming && _isStreamSimulating != simulate) {
-        int result = smi_quit();
-        if (result != SMI_RET_SUCCESS) {
-            qCWarning(interfaceapp) << "Eye Tracker: Error stopping streaming:" << smiReturnValueToString(result);
-        }
-        _isStreaming = false;
-    }
-
-    if (enabled && !_isStreaming) {
-        // Start SMI streaming in a separate thread because it blocks.
-        QFuture<int> future = QtConcurrent::run(this, &EyeTracker::startStreaming, simulate);
-        _startStreamingWatcher.setFuture(future);
-        _isStreamSimulating = simulate;
-    }
-
-    _isEnabled = enabled;
-    _isSimulating = simulate;
-
-#endif
-}
-
-void EyeTracker::reset() {
-    // Nothing to do.
-}
-
-bool EyeTracker::isTracking() const {
-    static const quint64 ACTIVE_TIMEOUT_USECS = 2000000;  // 2 secs
-    return _isEnabled && (usecTimestampNow() - _lastProcessDataTimestamp < ACTIVE_TIMEOUT_USECS);
-}
-
-#ifdef HAVE_IVIEWHMD
-void EyeTracker::calibrate(int points) {
-
-    if (!_isStreaming) {
-        qCWarning(interfaceapp) << "Eye Tracker: Cannot calibrate because not streaming";
-        return;
-    }
-
-    smi_CalibrationHMDStruct* calibrationHMDStruct;
-    smi_createCalibrationHMDStruct(&calibrationHMDStruct);
-
-    smi_CalibrationTypeEnum calibrationType;
-    switch (points) {
-        case 1:
-            calibrationType = SMI_ONE_POINT_CALIBRATION;
-            qCDebug(interfaceapp) << "Eye Tracker: One point calibration";
-            break;
-        case 3:
-            calibrationType = SMI_THREE_POINT_CALIBRATION;
-            qCDebug(interfaceapp) << "Eye Tracker: Three point calibration";
-            break;
-        case 5:
-            calibrationType = SMI_FIVE_POINT_CALIBRATION;
-            qCDebug(interfaceapp) << "Eye Tracker: Five point calibration";
-            break;
-        default:
-            qCWarning(interfaceapp) << "Eye Tracker: Invalid calibration specified";
-            return;
-    }
-
-    calibrationHMDStruct->type = calibrationType;
-    calibrationHMDStruct->backgroundColor->blue = 0.5;
-    calibrationHMDStruct->backgroundColor->green = 0.5;
-    calibrationHMDStruct->backgroundColor->red = 0.5;
-    calibrationHMDStruct->foregroundColor->blue = 1.0;
-    calibrationHMDStruct->foregroundColor->green = 1.0;
-    calibrationHMDStruct->foregroundColor->red = 1.0;
-    
-    int result = smi_setupCalibration(calibrationHMDStruct);
-    if (result != SMI_RET_SUCCESS) {
-        qCWarning(interfaceapp) << "Eye Tracker: Error setting up calibration:" << smiReturnValueToString(result);
-        return;
-    } else {
-        result = smi_calibrate();
-        if (result != SMI_RET_SUCCESS) {
-            qCWarning(interfaceapp) << "Eye Tracker: Error performing calibration:" << smiReturnValueToString(result);
-        } else {
-            result = smi_saveCalibration(HIGH_FIDELITY_EYE_TRACKER_CALIBRATION);
-            if (result != SMI_RET_SUCCESS) {
-               qCWarning(interfaceapp) << "Eye Tracker: Error saving calibration:" << smiReturnValueToString(result);
-            }
-        }
-    }
-
-    if (result != SMI_RET_SUCCESS) {
-        OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", "Calibration error: " + smiReturnValueToString(result));
-    }
-}
-#endif
-
-#ifdef HAVE_IVIEWHMD
-QString EyeTracker::smiReturnValueToString(int value) {
-    switch (value)
-    {
-        case smi_ErrorReturnValue::SMI_ERROR_NO_CALLBACK_SET:
-            return "No callback set";
-        case smi_ErrorReturnValue::SMI_ERROR_CONNECTING_TO_HMD:
-            return "Error connecting to HMD";
-        case smi_ErrorReturnValue::SMI_ERROR_HMD_NOT_SUPPORTED:
-            return "HMD not supported";
-        case smi_ErrorReturnValue::SMI_ERROR_NOT_IMPLEMENTED:
-            return "Not implmented";
-        case smi_ErrorReturnValue::SMI_ERROR_INVALID_PARAMETER:
-            return "Invalid parameter";
-        case smi_ErrorReturnValue::SMI_ERROR_EYECAMERAS_NOT_AVAILABLE:
-            return "Eye cameras not available";
-        case smi_ErrorReturnValue::SMI_ERROR_OCULUS_RUNTIME_NOT_SUPPORTED:
-            return "Oculus runtime not supported";
-        case smi_ErrorReturnValue::SMI_ERROR_FILE_NOT_FOUND:
-           return "File not found";
-        case smi_ErrorReturnValue::SMI_ERROR_FILE_EMPTY:
-           return "File empty";
-        case smi_ErrorReturnValue::SMI_ERROR_UNKNOWN:
-            return "Unknown error";
-        default:
-            QString number;
-            number.setNum(value);
-            return number;
-    }
-}
-#endif
diff --git a/libraries/trackers/src/trackers/EyeTracker.h b/libraries/trackers/src/trackers/EyeTracker.h
deleted file mode 100644
index 9cf35d0f2a..0000000000
--- a/libraries/trackers/src/trackers/EyeTracker.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  Created by David Rowe on 27 Jul 2015.
-//  Copyright 2015 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_EyeTracker_h
-#define hifi_EyeTracker_h
-
-#include <QObject>
-#include <QFutureWatcher>
-
-#include <glm/glm.hpp>
-
-#include <DependencyManager.h>
-#ifdef HAVE_IVIEWHMD
-#include <iViewHMDAPI.h>
-#endif
-
-
-class EyeTracker : public QObject, public Dependency {
-    Q_OBJECT
-    SINGLETON_DEPENDENCY
-
-public:
-    ~EyeTracker();
-
-    void init();
-    void setEnabled(bool enabled, bool simulate);
-    void reset();
-
-    bool isInitialized() const { return _isInitialized; }
-    bool isEnabled() const { return _isEnabled; }
-    bool isTracking() const;
-    bool isSimulating() const { return _isSimulating; }
-
-    glm::vec3 getLookAtPosition() const { return _lookAtPosition; }  // From mid eye point in head frame.
-    
-#ifdef HAVE_IVIEWHMD
-    void processData(smi_CallbackDataStruct* data);
-
-    void calibrate(int points);
-
-    int startStreaming(bool simulate);
-
-private slots:
-    void onStreamStarted();
-#endif
-
-private:
-    QString smiReturnValueToString(int value);
-    
-    bool _isInitialized = false;
-    bool _isEnabled = false;
-    bool _isSimulating = false;
-    bool _isStreaming = false;
-    bool _isStreamSimulating = false;
-
-    quint64 _lastProcessDataTimestamp;
-
-    glm::vec3 _lookAtPosition;
-
-    QFutureWatcher<int> _startStreamingWatcher;
-};
-
-#endif // hifi_EyeTracker_h
diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp
index 1140dbb079..abce5479c4 100644
--- a/libraries/ui/src/QmlWindowClass.cpp
+++ b/libraries/ui/src/QmlWindowClass.cpp
@@ -136,13 +136,9 @@ void QmlWindowClass::initQml(QVariantMap properties) {
 #if !defined(Q_OS_ANDROID)
         // If the restricted flag is on, override the FileTypeProfile and HFWebEngineProfile objects in the 
         // QML surface root context with local ones
-        qDebug() << "Context initialization lambda";
-        if (_restricted) {
-            qDebug() << "Restricting web content";
-            ContextAwareProfile::restrictContext(context);
-            FileTypeProfile::registerWithContext(context);
-            HFWebEngineProfile::registerWithContext(context);
-        }
+        ContextAwareProfile::restrictContext(context, _restricted);
+        FileTypeProfile::registerWithContext(context);
+        HFWebEngineProfile::registerWithContext(context);
 #endif
     };
 
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 35fb92a086..5dfdce0c63 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -42,6 +42,7 @@
 #include <NetworkAccessManager.h>
 #include <GLMHelpers.h>
 #include <AudioClient.h>
+#include <shared/LocalFileAccessGate.h>
 
 #include <gl/OffscreenGLCanvas.h>
 #include <gl/GLHelpers.h>
@@ -355,7 +356,7 @@ void OffscreenQmlSurface::onRootCreated() {
     getSurfaceContext()->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
 
     // Connect with the audio client and listen for audio device changes
-    connect(DependencyManager::get<AudioClient>().data(), &AudioClient::deviceChanged, this, [this](QAudio::Mode mode, const QAudioDeviceInfo& device) {
+    connect(DependencyManager::get<AudioClient>().data(), &AudioClient::deviceChanged, this, [this](QAudio::Mode mode, const HifiAudioDeviceInfo& device) {
         if (mode == QAudio::Mode::AudioOutput) {
             QMetaObject::invokeMethod(this, "changeAudioOutputDevice", Qt::QueuedConnection, Q_ARG(QString, device.deviceName()));
         }
@@ -814,4 +815,24 @@ void OffscreenQmlSurface::forceQmlAudioOutputDeviceUpdate() {
 #endif
 }
 
+void OffscreenQmlSurface::loadFromQml(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) {
+    auto objectCallback = [callback](QQmlContext* context, QQuickItem* newItem) {
+        QJSValue(callback).call(QJSValueList() << context->engine()->newQObject(newItem));
+    };
+
+    if (hifi::scripting::isLocalAccessSafeThread()) {
+        // If this is a 
+        auto contextCallback = [callback](QQmlContext* context) {
+            ContextAwareProfile::restrictContext(context, false);
+#if !defined(Q_OS_ANDROID)
+            FileTypeProfile::registerWithContext(context);
+            HFWebEngineProfile::registerWithContext(context);
+#endif
+        };
+        loadInternal(qmlSource, true, parent, objectCallback, contextCallback);
+    } else {
+        loadInternal(qmlSource, false, parent, objectCallback);
+    }
+}
+
 #include "OffscreenQmlSurface.moc"
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.h b/libraries/ui/src/ui/OffscreenQmlSurface.h
index 8bb22a8c79..76533a49cb 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.h
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.h
@@ -37,8 +37,8 @@ public:
     Q_INVOKABLE void lowerKeyboard();
     PointerEvent::EventType choosePointerEventType(QEvent::Type type);
     Q_INVOKABLE unsigned int deviceIdByTouchPoint(qreal x, qreal y);
-    
-    
+   
+
 signals:
     void focusObjectChanged(QObject* newFocus);
     void focusTextChanged(bool focusText);
@@ -61,6 +61,7 @@ public slots:
     void sendToQml(const QVariant& message);
 
 protected:
+    void loadFromQml(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) override;
     void clearFocusItem();
     void setFocusText(bool newFocusText);
     void initializeEngine(QQmlEngine* engine) override;
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index a8f319286b..75b08ba44f 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -12,6 +12,7 @@
 #include <QtQml/QQmlProperty>
 
 #include <shared/QtHelpers.h>
+#include <shared/LocalFileAccessGate.h>
 #include <PathUtils.h>
 #include <DependencyManager.h>
 #include <AccountManager.h>
@@ -591,12 +592,51 @@ void TabletProxy::gotoMenuScreen(const QString& submenu) {
     }
 }
 
-void TabletProxy::loadQMLOnTop(const QVariant& path) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadQMLOnTop", Q_ARG(QVariant, path));
+void TabletProxy::loadQMLOnTopImpl(const QVariant& path, bool localSafeContext) {
+     if (QThread::currentThread() != thread()) {
+        qCWarning(uiLogging) << __FUNCTION__ << "may not be called directly by scripts";
         return;
     }
 
+     QObject* root = nullptr;
+     if (!_toolbarMode && _qmlTabletRoot) {
+         root = _qmlTabletRoot;
+     } else if (_toolbarMode && _desktopWindow) {
+         root = _desktopWindow->asQuickItem();
+     }
+
+     if (root) {
+         if (localSafeContext) {
+             hifi::scripting::setLocalAccessSafeThread(true);
+         }
+         QMetaObject::invokeMethod(root, "loadQMLOnTop", Q_ARG(const QVariant&, path));
+         QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
+         if (_toolbarMode && _desktopWindow) {
+             QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
+         }
+         hifi::scripting::setLocalAccessSafeThread(false);
+     } else {
+         qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
+     }
+}
+
+void TabletProxy::loadQMLOnTop(const QVariant& path) {
+    bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "loadQMLOnTopImpl", Q_ARG(QVariant, path), Q_ARG(bool, localSafeContext));
+        return;
+    }
+
+    loadQMLOnTopImpl(path, localSafeContext);
+}
+
+void TabletProxy::returnToPreviousAppImpl(bool localSafeContext) {
+    if (QThread::currentThread() != thread()) {
+        qCWarning(uiLogging) << __FUNCTION__ << "may not be called directly by scripts";
+        return;
+
+    }
+
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -605,43 +645,45 @@ void TabletProxy::loadQMLOnTop(const QVariant& path) {
     }
 
     if (root) {
-        QMetaObject::invokeMethod(root, "loadQMLOnTop", Q_ARG(const QVariant&, path));
-        QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
-        if (_toolbarMode && _desktopWindow) {
-            QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
+        if (localSafeContext) {
+            hifi::scripting::setLocalAccessSafeThread(true);
         }
+        QMetaObject::invokeMethod(root, "returnToPreviousApp");
+        QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
+        hifi::scripting::setLocalAccessSafeThread(false);
     } else {
         qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
     }
 }
 
 void TabletProxy::returnToPreviousApp() {
+    bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
+    qDebug() << "TabletProxy::returnToPreviousApp -> localSafeContext: " << localSafeContext;
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "returnToPreviousApp");
+        QMetaObject::invokeMethod(this, "returnToPreviousAppImpl", Q_ARG(bool, localSafeContext));
         return;
     }
 
-    QObject* root = nullptr;
-    if (!_toolbarMode && _qmlTabletRoot) {
-        root = _qmlTabletRoot;
-    } else if (_toolbarMode && _desktopWindow) {
-        root = _desktopWindow->asQuickItem();
-    }
-
-    if (root) {
-        QMetaObject::invokeMethod(root, "returnToPreviousApp");
-        QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
-    } else {
-        qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
-    }
+    returnToPreviousAppImpl(localSafeContext);
 }
-    
+
 void TabletProxy::loadQMLSource(const QVariant& path, bool resizable) {
+    // Capture whether the current script thread is allowed to load local HTML content, 
+    // pass the information along to the real function
+    bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadQMLSource", Q_ARG(QVariant, path), Q_ARG(bool, resizable));
+        QMetaObject::invokeMethod(this, "loadQMLSourceImpl", Q_ARG(QVariant, path), Q_ARG(bool, resizable), Q_ARG(bool, localSafeContext));
         return;
     }
+    loadQMLSourceImpl(path, resizable, localSafeContext);
+}
 
+void TabletProxy::loadQMLSourceImpl(const QVariant& path, bool resizable, bool localSafeContext) {
+    if (QThread::currentThread() != thread()) {
+        qCWarning(uiLogging) << __FUNCTION__ << "may not be called directly by scripts";
+        return;
+
+    }
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -650,7 +692,14 @@ void TabletProxy::loadQMLSource(const QVariant& path, bool resizable) {
     }
 
     if (root) {
+        // BUGZ-1398: tablet access to local HTML files from client scripts
+        // Here we TEMPORARILY mark the main thread as allowed to load local file content, 
+        // because the thread that originally made the call is so marked.  
+        if (localSafeContext) {
+            hifi::scripting::setLocalAccessSafeThread(true);
+        }
         QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));
+        hifi::scripting::setLocalAccessSafeThread(false);
         _state = State::QML;
         _currentPathLoaded = path;
         QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
@@ -776,11 +825,25 @@ void TabletProxy::loadWebScreenOnTop(const QVariant& url) {
 }
 
 void TabletProxy::loadWebScreenOnTop(const QVariant& url, const QString& injectJavaScriptUrl) {
+    bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadWebScreenOnTop", Q_ARG(QVariant, url), Q_ARG(QString, injectJavaScriptUrl));
+        QMetaObject::invokeMethod(this, "loadHTMLSourceImpl", Q_ARG(QVariant, url), Q_ARG(QString, injectJavaScriptUrl), Q_ARG(bool, localSafeContext));
         return;
     }
 
+    loadHTMLSourceImpl(url, injectJavaScriptUrl, localSafeContext);
+}
+
+
+
+void TabletProxy::loadHTMLSourceImpl(const QVariant& url, const QString& injectJavaScriptUrl, bool localSafeContext) {
+    if (QThread::currentThread() != thread()) {
+        qCWarning(uiLogging) << __FUNCTION__ << "may not be called directly by scripts";
+        return;
+
+    }
+
+
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -789,22 +852,33 @@ void TabletProxy::loadWebScreenOnTop(const QVariant& url, const QString& injectJ
     }
 
     if (root) {
+        if (localSafeContext) {
+            hifi::scripting::setLocalAccessSafeThread(true);
+        }
         QMetaObject::invokeMethod(root, "loadQMLOnTop", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
         QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
         if (_toolbarMode && _desktopWindow) {
             QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
         }
         QMetaObject::invokeMethod(root, "loadWebOnTop", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectJavaScriptUrl)));
+        hifi::scripting::setLocalAccessSafeThread(false);
     }
     _state = State::Web;
 }
 
 void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) {
+    bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase));
+        QMetaObject::invokeMethod(this, "loadHTMLSourceImpl", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase), Q_ARG(bool, localSafeContext));
         return;
     }
 
+
+    loadHTMLSourceImpl(url, injectedJavaScriptUrl, loadOtherBase, localSafeContext);
+}
+
+void TabletProxy::loadHTMLSourceImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext) {
+
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -813,6 +887,9 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
     }
 
     if (root) {
+        if (localSafeContext) {
+            hifi::scripting::setLocalAccessSafeThread(true);
+        }
         if (loadOtherBase) {
             QMetaObject::invokeMethod(root, "loadTabletWebBase", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
         } else {
@@ -822,6 +899,8 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
         if (_toolbarMode && _desktopWindow) {
             QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
         }
+
+        hifi::scripting::setLocalAccessSafeThread(false);
         _state = State::Web;
         _currentPathLoaded = QVariant(url);
     } else {
@@ -891,8 +970,6 @@ void TabletProxy::sendToQml(const QVariant& msg) {
     }
 }
 
-
-
 OffscreenQmlSurface* TabletProxy::getTabletSurface() {
     if (QThread::currentThread() != thread()) {
         OffscreenQmlSurface* result = nullptr;
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h
index afd77a15f6..58596d6d92 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@@ -279,6 +279,7 @@ public:
      * @param {string} [injectedJavaScriptUrl=""] - The URL of JavaScript to inject into the web page.
      * @param {boolean} [loadOtherBase=false] - If <code>true</code>, the web page or app is displayed in a frame with "back" 
      * and "close" buttons.
+     * <p class="important">Deprecated: This parameter is deprecated and will be removed.</p>
      */
     Q_INVOKABLE void gotoWebScreen(const QString& url);
     Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false);
@@ -291,6 +292,33 @@ public:
      *     to have it not resizable.
      */
     Q_INVOKABLE void loadQMLSource(const QVariant& path, bool resizable = false);
+
+    /**jsdoc
+     * Internal function, do not call from scripts
+     * @function TabletProxy#loadQMLSourceImpl
+     */
+    Q_INVOKABLE void loadQMLSourceImpl(const QVariant& path, bool resizable, bool localSafeContext);
+
+     /**jsdoc
+     * Internal function, do not call from scripts
+     * @function TabletProxy#loadHTMLSourceImpl
+     */
+    Q_INVOKABLE void loadHTMLSourceImpl(const QVariant& url, const QString& injectJavaScriptUrl, bool localSafeContext);
+
+     /**jsdoc
+     * Internal function, do not call from scripts
+     * @function TabletProxy#loadHTMLSourceImpl
+     */
+    Q_INVOKABLE void loadHTMLSourceImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext);
+
+     /**jsdoc
+     * Internal function, do not call from scripts
+     * @function TabletProxy#returnToPreviousAppImpl
+     */
+    Q_INVOKABLE void returnToPreviousAppImpl(bool localSafeContext);
+
+    Q_INVOKABLE void loadQMLOnTopImpl(const QVariant& path, bool localSafeContext);
+
     // FIXME: This currently relies on a script initializing the tablet (hence the bool denoting success);
     //        it should be initialized internally so it cannot fail
 
diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.cpp b/libraries/ui/src/ui/types/ContextAwareProfile.cpp
index 98cc94ec10..f74e8754c9 100644
--- a/libraries/ui/src/ui/types/ContextAwareProfile.cpp
+++ b/libraries/ui/src/ui/types/ContextAwareProfile.cpp
@@ -11,22 +11,47 @@
 
 #include "ContextAwareProfile.h"
 
-#if !defined(Q_OS_ANDROID)
-
+#include <cassert>
+#include <QtCore/QThread>
 #include <QtQml/QQmlContext>
 
+#include <shared/QtHelpers.h>
+#include <SharedUtil.h>
+
 static const QString RESTRICTED_FLAG_PROPERTY = "RestrictFileAccess";
 
-ContextAwareProfile::ContextAwareProfile(QQmlContext* parent) :
-    QQuickWebEngineProfile(parent), _context(parent) { }
-
-
-void ContextAwareProfile::restrictContext(QQmlContext* context) {
-    context->setContextProperty(RESTRICTED_FLAG_PROPERTY, true);
+ContextAwareProfile::ContextAwareProfile(QQmlContext* context) :
+    ContextAwareProfileParent(context), _context(context) { 
+    assert(context);
 }
 
-bool ContextAwareProfile::isRestricted(QQmlContext* context) {
-    return context->contextProperty(RESTRICTED_FLAG_PROPERTY).toBool();
+
+void ContextAwareProfile::restrictContext(QQmlContext* context, bool restrict) {
+    context->setContextProperty(RESTRICTED_FLAG_PROPERTY, restrict);
 }
 
-#endif
\ No newline at end of file
+bool ContextAwareProfile::isRestrictedInternal() {
+    if (QThread::currentThread() != thread()) {
+        bool restrictedResult = false;
+        BLOCKING_INVOKE_METHOD(this, "isRestrictedInternal", Q_RETURN_ARG(bool, restrictedResult));
+        return restrictedResult;
+    }
+
+    QVariant variant = _context->contextProperty(RESTRICTED_FLAG_PROPERTY);
+    if (variant.isValid()) {
+        return variant.toBool();
+    }
+
+    // BUGZ-1365 - we MUST defalut to restricted mode in the absence of a flag, or it's too easy for someone to make 
+    // a new mechanism for loading web content that fails to restrict access to local files
+    return true;
+}
+
+bool ContextAwareProfile::isRestricted() {
+    auto now = usecTimestampNow();
+    if (now > _cacheExpiry) {
+        _cachedValue = isRestrictedInternal();
+        _cacheExpiry = now + MAX_CACHE_AGE;
+    }
+    return _cachedValue;
+}
diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.h b/libraries/ui/src/ui/types/ContextAwareProfile.h
index 8fa5b98878..3192d2be54 100644
--- a/libraries/ui/src/ui/types/ContextAwareProfile.h
+++ b/libraries/ui/src/ui/types/ContextAwareProfile.h
@@ -17,26 +17,40 @@
 #include <QtWebEngine/QQuickWebEngineProfile>
 #include <QtWebEngineCore/QWebEngineUrlRequestInterceptor>
 
+using ContextAwareProfileParent = QQuickWebEngineProfile;
+using RequestInterceptorParent = QWebEngineUrlRequestInterceptor;
+#else
+#include <QtCore/QObject>
+
+using ContextAwareProfileParent = QObject;
+using RequestInterceptorParent = QObject;
+#endif
+
+#include <NumericalConstants.h>
+
 class QQmlContext;
 
-class ContextAwareProfile : public QQuickWebEngineProfile {
+class ContextAwareProfile : public ContextAwareProfileParent {
+    Q_OBJECT
 public:
-    static void restrictContext(QQmlContext* context);
-    static bool isRestricted(QQmlContext* context);
-    QQmlContext* getContext() const { return _context; }
+    static void restrictContext(QQmlContext* context, bool restrict = true);
+    bool isRestricted();
+    Q_INVOKABLE bool isRestrictedInternal();
 protected:
 
-    class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
+    class RequestInterceptor : public RequestInterceptorParent {
     public:
-        RequestInterceptor(ContextAwareProfile* parent) : QWebEngineUrlRequestInterceptor(parent), _profile(parent) {}
-        QQmlContext* getContext() const { return _profile->getContext(); }
+        RequestInterceptor(ContextAwareProfile* parent) : RequestInterceptorParent(parent), _profile(parent) { }
+        bool isRestricted() { return _profile->isRestricted(); }
     protected:
         ContextAwareProfile* _profile;
     };
 
     ContextAwareProfile(QQmlContext* parent);
-    QQmlContext* _context;
+    QQmlContext* _context{ nullptr };
+    bool _cachedValue{ false };
+    quint64 _cacheExpiry{ 0 };
+    constexpr static quint64 MAX_CACHE_AGE = MSECS_PER_SECOND;
 };
-#endif
 
 #endif // hifi_FileTypeProfile_h
diff --git a/libraries/ui/src/ui/types/FileTypeProfile.cpp b/libraries/ui/src/ui/types/FileTypeProfile.cpp
index 073460903e..615e80b85c 100644
--- a/libraries/ui/src/ui/types/FileTypeProfile.cpp
+++ b/libraries/ui/src/ui/types/FileTypeProfile.cpp
@@ -29,8 +29,8 @@ FileTypeProfile::FileTypeProfile(QQmlContext* parent) :
 }
 
 void FileTypeProfile::RequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& info) {
-    RequestFilters::interceptHFWebEngineRequest(info, getContext());
-    RequestFilters::interceptFileType(info, getContext());
+    RequestFilters::interceptHFWebEngineRequest(info, isRestricted());
+    RequestFilters::interceptFileType(info);
 }
 
 void FileTypeProfile::registerWithContext(QQmlContext* context) {
diff --git a/libraries/ui/src/ui/types/HFWebEngineProfile.cpp b/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
index ef1d009f09..3c5701cc52 100644
--- a/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
+++ b/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
@@ -28,7 +28,7 @@ HFWebEngineProfile::HFWebEngineProfile(QQmlContext* parent) : Parent(parent)
 }
 
 void HFWebEngineProfile::RequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& info) {
-    RequestFilters::interceptHFWebEngineRequest(info, getContext());
+    RequestFilters::interceptHFWebEngineRequest(info, isRestricted());
 }
 
 void HFWebEngineProfile::registerWithContext(QQmlContext* context) {
diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp
index a3b3b7dc57..3fa1cd0bd9 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -63,8 +63,8 @@ namespace {
      }
 }
 
-void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info, QQmlContext* context) {
-    if (ContextAwareProfile::isRestricted(context) && blockLocalFiles(info)) {
+void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info, bool restricted) {
+    if (restricted && blockLocalFiles(info)) {
         return;
     }
 
@@ -90,7 +90,7 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info,
     info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
 }
 
-void RequestFilters::interceptFileType(QWebEngineUrlRequestInfo& info, QQmlContext* context) {
+void RequestFilters::interceptFileType(QWebEngineUrlRequestInfo& info) {
     QString filename = info.requestUrl().fileName();
     if (isScript(filename) || isJSON(filename)) {
         static const QString CONTENT_HEADER = "Accept";
diff --git a/libraries/ui/src/ui/types/RequestFilters.h b/libraries/ui/src/ui/types/RequestFilters.h
index 8fde94a1b4..0c25bbb354 100644
--- a/libraries/ui/src/ui/types/RequestFilters.h
+++ b/libraries/ui/src/ui/types/RequestFilters.h
@@ -24,8 +24,8 @@ class QQmlContext;
 
 class RequestFilters : public QObject {
 public:
-    static void interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info, QQmlContext* context);
-    static void interceptFileType(QWebEngineUrlRequestInfo& info, QQmlContext* context);
+    static void interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info, bool restricted);
+    static void interceptFileType(QWebEngineUrlRequestInfo& info);
 };
 #endif
 
diff --git a/libraries/workload/src/workload/ViewTask.cpp b/libraries/workload/src/workload/ViewTask.cpp
index 1c8e4d34b1..97d1e3a46e 100644
--- a/libraries/workload/src/workload/ViewTask.cpp
+++ b/libraries/workload/src/workload/ViewTask.cpp
@@ -10,6 +10,8 @@
 //
 #include "ViewTask.h"
 
+#include <Profile.h>
+
 using namespace workload;
 
 
@@ -181,8 +183,11 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
 
     auto loopDuration = timings[5];
     regionBackFronts[workload::Region::R1] = regionRegulators[workload::Region::R1].run(loopDuration, timings[2] + timings[3], regionBackFronts[workload::Region::R1]);
+    PROFILE_COUNTER(workload, "R1Front", { { "R1", regionBackFronts[workload::Region::R1].y} } );
     regionBackFronts[workload::Region::R2] = regionRegulators[workload::Region::R2].run(loopDuration, timings[2] + timings[3], regionBackFronts[workload::Region::R2]);
+    PROFILE_COUNTER(workload, "R2Front", { { "R2", regionBackFronts[workload::Region::R2].y } } );
     regionBackFronts[workload::Region::R3] = regionRegulators[workload::Region::R3].run(loopDuration, timings[4], regionBackFronts[workload::Region::R3]);
+    PROFILE_COUNTER(workload, "R3Front", { { "R3", regionBackFronts[workload::Region::R3].y } } );
 
     enforceRegionContainment();
     for (auto& outView : outViews) {
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4a0f52e272..1150e27cac 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -43,3 +43,7 @@ set(DIR "pcmCodec")
 add_subdirectory(${DIR})
 set(DIR "hifiCodec")
 add_subdirectory(${DIR})
+
+# example plugins
+set(DIR "KasenAPIExample")
+add_subdirectory(${DIR})
diff --git a/plugins/KasenAPIExample/CMakeLists.txt b/plugins/KasenAPIExample/CMakeLists.txt
new file mode 100644
index 0000000000..96ac84e10d
--- /dev/null
+++ b/plugins/KasenAPIExample/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(TARGET_NAME KasenAPIExample)
+setup_hifi_client_server_plugin(scripting)
+link_hifi_libraries(shared plugins avatars networking graphics gpu)
diff --git a/plugins/KasenAPIExample/src/ExampleScriptPlugin.h b/plugins/KasenAPIExample/src/ExampleScriptPlugin.h
new file mode 100644
index 0000000000..a6af105e0e
--- /dev/null
+++ b/plugins/KasenAPIExample/src/ExampleScriptPlugin.h
@@ -0,0 +1,56 @@
+//
+//  ExampleScriptPlugin.h
+//  plugins/KasenAPIExample/src
+//
+//  Created by Kasen IO on 2019.07.14 | realities.dev | kasenvr@gmail.com
+//  Copyright 2019 Kasen IO
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+// Supporting file containing all QtScript specific integration.
+
+#ifndef EXAMPLE_SCRIPT_PLUGIN_H
+#define EXAMPLE_SCRIPT_PLUGIN_H
+
+#if DEV_BUILD
+#pragma message("QtScript is deprecated see: doc.qt.io/qt-5/topics-scripting.html")
+#endif
+#include <QtScript/QScriptEngine>
+
+#include <QtCore/QLoggingCategory>
+#include <QCoreApplication>
+#include <shared/ScriptInitializerMixin.h>
+
+namespace example {
+
+extern const QLoggingCategory& logger;
+
+inline void setGlobalInstance(QScriptEngine* engine, const QString& name, QObject* object) {
+    auto value = engine->newQObject(object, QScriptEngine::QtOwnership);
+    engine->globalObject().setProperty(name, value);
+    qCDebug(logger) << "setGlobalInstance" << name << engine->property("fileName");
+}
+
+class ScriptPlugin : public QObject {
+    Q_OBJECT
+    QString _version;
+    Q_PROPERTY(QString version MEMBER _version CONSTANT)
+protected:
+    inline ScriptPlugin(const QString& name, const QString& version) : _version(version) {
+        setObjectName(name);
+        if (!DependencyManager::get<ScriptInitializers>()) {
+            qCWarning(logger) << "COULD NOT INITIALIZE (ScriptInitializers unavailable)" << qApp << this;
+            return;
+        }
+        qCWarning(logger) << "registering w/ScriptInitializerMixin..." << DependencyManager::get<ScriptInitializers>().data();
+        DependencyManager::get<ScriptInitializers>()->registerScriptInitializer(
+            [this](QScriptEngine* engine) { setGlobalInstance(engine, objectName(), this); });
+    }
+public slots:
+    inline QString toString() const { return QString("[%1 version=%2]").arg(objectName()).arg(_version); }
+};
+
+}  // namespace example
+
+#endif
\ No newline at end of file
diff --git a/plugins/KasenAPIExample/src/KasenAPIExample.cpp b/plugins/KasenAPIExample/src/KasenAPIExample.cpp
new file mode 100644
index 0000000000..d566d11376
--- /dev/null
+++ b/plugins/KasenAPIExample/src/KasenAPIExample.cpp
@@ -0,0 +1,139 @@
+//
+//  KasenAPIExample.cpp
+//  plugins/KasenAPIExample/src
+//
+//  Created by Kasen IO on 2019.07.14 | realities.dev | kasenvr@gmail.com
+//  Copyright 2019 Kasen IO
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+// Example of prototyping new JS APIs by leveraging the existing plugin system.
+
+#include "ExampleScriptPlugin.h"
+
+#include <QCoreApplication>
+#include <QtCore/QJsonObject>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
+
+#include <SharedUtil.h>
+#include <AvatarHashMap.h>
+
+namespace custom_api_example {
+
+QLoggingCategory logger{ "custom_api_example" };
+
+class KasenAPIExample : public example::ScriptPlugin {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "KasenAPIExample" FILE "plugin.json")
+public:
+    KasenAPIExample() : example::ScriptPlugin("KasenAPIExample", "0.0.1") {
+        qCInfo(logger) << "plugin loaded" << qApp << toString() << QThread::currentThread(); 
+    }
+
+public slots:
+    /**jsdoc
+     * Returns current microseconds (usecs) since Epoch. note: 1000usecs == 1ms
+     * @example <caption>Measure current setTimeout accuracy.</caption>
+     * var expected = 1000;
+     * var start = KasenAPIExample.now();
+     * Script.setTimeout(function () {
+     *     var elapsed = (KasenAPIExample.now() - start)/1000;
+     *     print("expected (ms):", expected, "actual (ms):", elapsed);
+     * }, expected);
+     */
+    QVariant now() const {
+        return usecTimestampNow();
+    }
+
+    /**jsdoc
+     * Returns the available blendshape names for an avatar.
+     * @example <caption>Get blendshape names</caption>
+     * print(JSON.stringify(KasenAPIExample.getBlendshapeNames(MyAvatar.sessionUUID)));
+     */
+    QStringList getBlendshapeNames(const QUuid& avatarID) const {
+        QVector<QString> out;
+        if (auto head = getAvatarHead(avatarID)) {
+            for (const auto& kv : head->getBlendshapeMap().toStdMap()) {
+                if (kv.second >= out.size()) out.resize(kv.second+1);
+                out[kv.second] = kv.first;
+            }
+        }
+        return out.toList();
+    }
+
+    /**jsdoc
+     * Returns a key-value object with active (non-zero) blendshapes.
+     * eg: { JawOpen: 1.0, ... }
+     * @example <caption>Get active blendshape map</caption>
+     * print(JSON.stringify(KasenAPIExample.getActiveBlendshapes(MyAvatar.sessionUUID)));
+     */
+    QVariant getActiveBlendshapes(const QUuid& avatarID) const {
+        if (auto head = getAvatarHead(avatarID)) {
+            return head->toJson()["blendShapes"].toVariant();
+        }
+        return {};
+    }
+
+    QVariant getBlendshapeMapping(const QUuid& avatarID) const {
+        QVariantMap out;
+        if (auto head = getAvatarHead(avatarID)) {
+            for (const auto& kv : head->getBlendshapeMap().toStdMap()) {
+                out[kv.first] = kv.second;
+            }
+        }
+        return out;
+    }
+
+    QVariant getBlendshapes(const QUuid& avatarID) const {
+        QVariantMap result;
+        if (auto head = getAvatarHead(avatarID)) {
+            QStringList names = getBlendshapeNames(avatarID);
+            auto states = head->getBlendshapeStates();
+            result = {
+                { "base", zipNonZeroValues(names, states.base) },
+                { "summed", zipNonZeroValues(names, states.summed) },
+                { "transient", zipNonZeroValues(names, states.transient) },
+            };
+        }
+        return result;
+    }
+
+private:
+    static QVariantMap zipNonZeroValues(const QStringList& keys, const QVector<float>& values) {
+        QVariantMap out;
+        for (int i=1; i < values.size(); i++) {
+            if (fabs(values[i]) > 1.0e-6) {
+                out[keys.value(i)] = values[i];
+            }
+        }
+        return out;
+    }
+    struct _HeadHelper : public HeadData {
+        QMap<QString,int> getBlendshapeMap() const {
+            return _blendshapeLookupMap;
+        }
+        struct States { QVector<float> base, summed, transient; };
+        States getBlendshapeStates() const {
+            return {
+                _blendshapeCoefficients,
+                _summedBlendshapeCoefficients,
+                _transientBlendshapeCoefficients
+            };
+        }
+    };
+    static const _HeadHelper* getAvatarHead(const QUuid& avatarID) {
+        auto avatars = DependencyManager::get<AvatarHashMap>();
+        auto avatar = avatars ? avatars->getAvatarBySessionID(avatarID) : nullptr;
+        auto head = avatar ? avatar->getHeadData() : nullptr;
+        return reinterpret_cast<const _HeadHelper*>(head);
+    }
+};
+
+}
+
+const QLoggingCategory& example::logger{ custom_api_example::logger };
+
+#include "KasenAPIExample.moc"
diff --git a/plugins/KasenAPIExample/src/plugin.json b/plugins/KasenAPIExample/src/plugin.json
new file mode 100644
index 0000000000..3e6931deec
--- /dev/null
+++ b/plugins/KasenAPIExample/src/plugin.json
@@ -0,0 +1,21 @@
+{
+    "name":"Kasen JS API Example",
+    "version": 1,
+    "package": {
+        "author": "Revofire",
+        "homepage": "www.realities.dev",
+        "version": "0.0.1",
+        "engines": {
+          "hifi-interface": ">= 0.83.0",
+          "hifi-assignment-client": ">= 0.83.0"
+        },
+        "config": {
+            "client": true,
+            "entity_client": true,
+            "entity_server": true,
+            "edit_filter": true,
+            "agent": true,
+            "avatar": true
+        }
+    }
+}
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h
index 25427c6dcd..9212a42639 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.h
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.h
@@ -76,6 +76,8 @@ public:
                                   int visionSqueezePerEye, float visionSqueezeGroundPlaneY,
                                   float visionSqueezeSpotlightSize) override;
 
+    glm::mat4 getSensorResetMatrix() const { return _sensorResetMat; }
+
 protected:
     bool internalActivate() override;
     void internalDeactivate() override;
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index c21a9ae4df..8aa7311de4 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -1319,13 +1319,13 @@ void ViveControllerManager::InputDevice::setConfigFromString(const QString& valu
  *     <tr><td><code>RX</code></td><td>number</td><td>number</td><td>Right stick x-axis scale.</td></tr>
  *     <tr><td><code>RY</code></td><td>number</td><td>number</td><td>Right stick y-axis scale.</td></tr>
  *     <tr><td><code>LS</code></td><td>number</td><td>number</td><td>Left touch pad pressed.</td></tr>
- *     <tr><td><code>LS_CENTER</code></td><td>number</td><td>number</td><td>Left touch pad center pressed.</td></tr>
- *     <tr><td><code>LS_X</code></td><td>number</td><td>number</td><td>Left touch pad pressed x-coordinate.</td></tr>
- *     <tr><td><code>LS_Y</code></td><td>number</td><td>number</td><td>Left touch pad pressed y-coordinate.</td></tr>
+ *     <tr><td><code>LSCenter</code></td><td>number</td><td>number</td><td>Left touch pad center pressed.</td></tr>
+ *     <tr><td><code>LSX</code></td><td>number</td><td>number</td><td>Left touch pad pressed x-coordinate.</td></tr>
+ *     <tr><td><code>LSY</code></td><td>number</td><td>number</td><td>Left touch pad pressed y-coordinate.</td></tr>
  *     <tr><td><code>RS</code></td><td>number</td><td>number</td><td>Right touch pad pressed.</td></tr>
- *     <tr><td><code>RS_CENTER</code></td><td>number</td><td>number</td><td>Right touch pad center pressed.</td></tr>
- *     <tr><td><code>RS_X</code></td><td>number</td><td>number</td><td>Right touch pad pressed x-coordinate.</td></tr>
- *     <tr><td><code>RS_Y</code></td><td>number</td><td>number</td><td>Right touch pad pressed y-coordinate.</td></tr>
+ *     <tr><td><code>RSCenter</code></td><td>number</td><td>number</td><td>Right touch pad center pressed.</td></tr>
+ *     <tr><td><code>RSX</code></td><td>number</td><td>number</td><td>Right touch pad pressed x-coordinate.</td></tr>
+ *     <tr><td><code>RSY</code></td><td>number</td><td>number</td><td>Right touch pad pressed y-coordinate.</td></tr>
  *     <tr><td><code>LSTouch</code></td><td>number</td><td>number</td><td>Left touch pad is touched.</td></tr>
  *     <tr><td><code>RSTouch</code></td><td>number</td><td>number</td><td>Right touch pad is touched.</td></tr>
  *     <tr><td colspan="4"><strong>Triggers</strong></td></tr>
diff --git a/scripts/developer/tests/ui/testLocalFileAccess.js b/scripts/developer/tests/ui/testLocalFileAccess.js
new file mode 100644
index 0000000000..0141d5a95f
--- /dev/null
+++ b/scripts/developer/tests/ui/testLocalFileAccess.js
@@ -0,0 +1,55 @@
+"use strict";
+
+//  Created by Bradley Austin Davis on 2019/08/29
+//  Copyright 2013-2019 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 indent: ["error", 4, { "outerIIFEBody": 0 }] */
+
+(function() { // BEGIN LOCAL_SCOPE
+
+    
+var QML_URL = "qrc:/qml/hifi/tablet/DynamicWebview.qml"
+var LOCAL_FILE_URL = "file:///C:/test-file.html"
+
+var TABLET_BUTTON_NAME = "SCRIPT";
+var ICONS = {
+    icon: "icons/tablet-icons/menu-i.svg",
+    activeIcon: "icons/tablet-icons/meni-a.svg"
+};
+
+
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+var button = tablet.addButton({
+    icon: ICONS.icon,
+    activeIcon: ICONS.activeIcon,
+    text: TABLET_BUTTON_NAME,
+    sortOrder: 1
+});
+
+function onClicked() {
+    var window = Desktop.createWindow(QML_URL, {
+        title: "Local file access test",
+        additionalFlags: Desktop.ALWAYS_ON_TOP,
+        presentationMode: Desktop.PresentationMode.NATIVE,
+        size: { x: 640, y: 480 },
+        visible: true,
+        position: { x: 100, y: 100 },
+    });
+    window.sendToQml({ url: LOCAL_FILE_URL });
+}
+
+button.clicked.connect(onClicked);
+
+Script.scriptEnding.connect(function () {
+    button.clicked.disconnect(onClicked);
+    tablet.removeButton(button);
+});
+
+}()); // END LOCAL_SCOPE
+
+
+
diff --git a/scripts/developer/tests/ui/testLocalFileAccessServer.js b/scripts/developer/tests/ui/testLocalFileAccessServer.js
new file mode 100644
index 0000000000..74fd52a216
--- /dev/null
+++ b/scripts/developer/tests/ui/testLocalFileAccessServer.js
@@ -0,0 +1,30 @@
+"use strict";
+
+//  Created by Bradley Austin Davis on 2019/08/29
+//  Copyright 2013-2019 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 QML_URL = "qrc:/qml/hifi/tablet/DynamicWebview.qml"
+    var LOCAL_FILE_URL = "file:///C:/test-file.html"
+
+    var _this = this;
+    _this.preload = function (pEntityID) {
+        var window = Desktop.createWindow(QML_URL, {
+            title: "Local file access test",
+            additionalFlags: Desktop.ALWAYS_ON_TOP,
+            presentationMode: Desktop.PresentationMode.NATIVE,
+            size: { x: 640, y: 480 },
+            visible: true,
+            position: { x: 100, y: 100 },
+        });
+        window.sendToQml({ url: LOCAL_FILE_URL });
+    };
+
+    _this.unload = function () {
+        console.log("QQQ on preload");
+    };
+});
diff --git a/scripts/developer/utilities/cache/cash.js b/scripts/developer/utilities/cache/cash.js
new file mode 100644
index 0000000000..14ecf873e3
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash.js
@@ -0,0 +1,59 @@
+"use strict";
+var Page = Script.require('../lib/skit/Page.js');
+
+function openView() {
+    //window.closed.connect(function() { Script.stop(); });
+
+
+    var pages = new Pages(Script.resolvePath("."));  
+    function fromQml(message) {
+        console.log(JSON.stringify(message))
+        if (message.method == "inspectResource") {
+            pages.open("openResourceInspector")
+            pages.sendTo("openResourceInspector", message)
+            return;
+        } 
+        if (pages.open(message.method)) {
+            return;
+        }    
+    }
+
+    function openCashWindow(window) {
+        var onMousePressEvent = function (e) {
+        };
+        Controller.mousePressEvent.connect(onMousePressEvent);
+    
+        var onMouseReleaseEvent = function () {
+        };
+        Controller.mouseReleaseEvent.connect(onMouseReleaseEvent);
+    
+        var onMouseMoveEvent = function (e) {
+        };
+        Controller.mouseMoveEvent.connect(onMouseMoveEvent);
+    }
+
+    function closeCashWindow() {
+        Controller.mousePressEvent.disconnect(onMousePressEvent);
+        Controller.mouseReleaseEvent.disconnect(onMouseReleaseEvent);
+        Controller.mouseMoveEvent.disconnect(onMouseMoveEvent);
+        pages.clear();
+    }
+ 
+
+    pages.addPage('Cash', 'Cash', "cash.qml", 300, 500, fromQml, openCashWindow, closeCashWindow);
+    pages.addPage('openModelCacheInspector', 'Model Cache Inspector', "cash/ModelCacheInspector.qml", 300, 500, fromQml);
+    pages.addPage('openMaterialCacheInspector', 'Material Cache Inspector', "cash/MaterialCacheInspector.qml", 300, 500, fromQml);
+    pages.addPage('openTextureCacheInspector', 'Texture Cache Inspector', "cash/TextureCacheInspector.qml", 300, 500, fromQml);
+    pages.addPage('openAnimationCacheInspector', 'Animation Cache Inspector', "cash/AnimationCacheInspector.qml", 300, 500);
+    pages.addPage('openSoundCacheInspector', 'Sound Cache Inspector', "cash/SoundCacheInspector.qml", 300, 500);
+    pages.addPage('openResourceInspector', 'Resource Inspector', "cash/ResourceInspector.qml", 300, 500);
+
+
+    pages.open('Cash');
+
+    
+    return pages;
+}
+
+
+openView();
diff --git a/scripts/developer/utilities/cache/cash.qml b/scripts/developer/utilities/cache/cash.qml
new file mode 100644
index 0000000000..159ce95c5f
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash.qml
@@ -0,0 +1,167 @@
+//
+//  cash.qml
+//
+//  Created by Sam Gateau on 17/9/2019
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.3
+
+import controlsUit 1.0 as HifiControls
+
+import "../lib/prop" as Prop
+import "cash"
+import "../lib/plotperf"
+
+Rectangle {
+    anchors.fill: parent 
+    id: root;   
+    
+    Prop.Global { id: global;}
+    color: global.color
+
+    ScrollView {
+        id: scrollView
+        anchors.fill: parent 
+        contentWidth: parent.width
+        clip: true
+         
+        Column {
+            id: column
+            width: parent.width
+
+            Prop.PropFolderPanel {
+                label: "Resource Queries Inspector"
+                isUnfold: true
+                panelFrameData: Component {
+                    Column {
+                        PlotPerf {
+                        title: "Global Queries"
+                        height: 80
+                        valueScale: 1
+                        valueUnit: ""
+                        plots: [
+                        {
+                            object: ModelCache,
+                            prop: "numGlobalQueriesPending",
+                            label: "Pending",
+                            color: "#1AC567"
+                        },
+                        {
+                            object: ModelCache,
+                            prop: "numGlobalQueriesLoading",
+                            label: "Loading",
+                            color: "#FEC567"
+                        },
+                        {
+                            object: ModelCache,
+                            prop: "numLoading",
+                            label: "Model Loading",
+                            color: "#C5FE67"
+                        }
+                        ]
+                        }
+                    }
+                }
+            }
+
+            Prop.PropFolderPanel {
+                label: "Cache Inspectors"
+                isUnfold: true
+                panelFrameData: Component {
+                    Column {
+                        Prop.PropButton {
+                            text: "Model"
+                            onClicked: {
+                                sendToScript({method: "openModelCacheInspector"}); 
+                            }
+                            width:column.width
+                        }
+                        Prop.PropButton {
+                            text: "Material"
+                            onClicked: {
+                                sendToScript({method: "openMaterialCacheInspector"}); 
+                            }
+                            width:column.width
+                        }
+                        Prop.PropButton {
+                            text: "Texture"
+                            onClicked: {
+                                sendToScript({method: "openTextureCacheInspector"}); 
+                            }
+                            width:column.width
+                        }
+                        Prop.PropButton {
+                            text: "Animation"
+                            onClicked: {
+                                sendToScript({method: "openAnimationCacheInspector"}); 
+                            }
+                            width:column.width
+                        }
+                        Prop.PropButton {
+                            text: "Sound"
+                            onClicked: {
+                                sendToScript({method: "openSoundCacheInspector"}); 
+                            }
+                            width:column.width
+                        }
+                    }
+                }
+            }
+            Prop.PropFolderPanel {
+                label: "Stats"
+                isUnfold: true
+                panelFrameData: Component { Column {
+                    PlotPerf {
+                        title: "Resources"
+                        height: 200
+                        valueScale: 1
+                        valueUnit: ""
+                        plots: [
+                        {
+                            object: TextureCache,
+                            prop: "numTotal",
+                            label: "Textures",
+                            color: "#1AC567"
+                        },
+                        {
+                            object: TextureCache,
+                            prop: "numCached",
+                            label: "Textures Cached",
+                            color: "#FEC567"
+                        },
+                        {
+                            object: ModelCache,
+                            prop: "numTotal",
+                            label: "Models",
+                            color: "#FED959"
+                        },
+                        {
+                            object: ModelCache,
+                            prop: "numCached",
+                            label: "Models Cached",
+                            color: "#FEFE59"
+                        },
+                        {
+                            object: MaterialCache,
+                            prop: "numTotal",
+                            label: "Materials",
+                            color: "#00B4EF"
+                        },
+                        {
+                            object: MaterialCache,
+                            prop: "numCached",
+                            label: "Materials Cached",
+                            color: "#FFB4EF"
+                        }
+                        ]
+                    }}
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/cache/cash/AnimationCacheInspector.qml b/scripts/developer/utilities/cache/cash/AnimationCacheInspector.qml
new file mode 100644
index 0000000000..4ded44c2b1
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/AnimationCacheInspector.qml
@@ -0,0 +1,21 @@
+//
+//  AnimationCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+import "../../lib/prop" as Prop
+
+ResourceCacheInspector {
+    id: root;
+    anchors.fill: parent.fill
+    cache: AnimationCache
+    cacheResourceName: "Animation"
+}
diff --git a/scripts/developer/utilities/cache/cash/MaterialCacheInspector.qml b/scripts/developer/utilities/cache/cash/MaterialCacheInspector.qml
new file mode 100644
index 0000000000..160c47c946
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/MaterialCacheInspector.qml
@@ -0,0 +1,21 @@
+//
+//  MaterialCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+import "../../lib/prop" as Prop
+
+ResourceCacheInspector {
+    id: root;
+    anchors.fill: parent.fill
+    cache: MaterialCache
+    cacheResourceName: "Material"
+}
diff --git a/scripts/developer/utilities/cache/cash/ModelCacheInspector.qml b/scripts/developer/utilities/cache/cash/ModelCacheInspector.qml
new file mode 100644
index 0000000000..017942dfc9
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/ModelCacheInspector.qml
@@ -0,0 +1,21 @@
+//
+//  ModelCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+import "../../lib/prop" as Prop
+
+ResourceCacheInspector {
+    id: root;
+    anchors.fill: parent.fill
+    cache: ModelCache
+    cacheResourceName: "Model"
+}
diff --git a/scripts/developer/utilities/cache/cash/ResourceCacheInspector.qml b/scripts/developer/utilities/cache/cash/ResourceCacheInspector.qml
new file mode 100644
index 0000000000..2fa0af8cbc
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/ResourceCacheInspector.qml
@@ -0,0 +1,367 @@
+//
+//  ResourceCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.12
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+import QtQml.Models 2.12
+
+import "../../lib/skit/qml" as Skit
+import "../../lib/prop" as Prop
+
+Item {
+    id: root;
+    Prop.Global { id: global }
+
+    anchors.fill: parent.fill
+    property var cache: {}
+    property string cacheResourceName: "" 
+
+    function fromScript(message) {
+        switch (message.method) {
+        case "resetItemList":
+            resetItemListFromCache()
+            break;
+        }
+    }
+
+    function requestResourceDetails(resourceURL) {
+        sendToScript({method: "inspectResource", params: {url: resourceURL, semantic: cacheResourceName}}); 
+    }
+
+    Component.onCompleted: {
+        resetItemListFromCache();
+    }
+
+    function fetchItemsList() {
+        var theList;
+        if (cache !== undefined) {
+            theList = cache.getResourceList();
+        } else {
+            theList = ["ResourceCacheInspector.cache is undefined"];
+        }
+        var theListString = new Array(theList.length)
+        for (var i in theList) {
+            theListString[i] = (theList[i].toString())
+        }
+        return theListString;
+    }
+
+    function resetItemListFromCache() {  
+        resetItemList(fetchItemsList())
+    }
+
+    property var needFreshList : false
+
+    function updateItemListFromCache() { 
+        needFreshList = true
+    }
+
+
+    Timer {
+        interval: 2000; running: true; repeat: true
+        onTriggered: pullFreshValues()
+    }
+
+    function pullFreshValues() {
+        if (needFreshList) {
+            updateItemList(fetchItemsList())
+            needFreshList = false
+        }
+    }
+    
+    property alias resourceItemsModel: visualModel.model  
+    property var currentItemsList: new Array();
+  
+    function packItemEntry(item, identifier) {
+        var entry = { "identifier": identifier, "name": "", "scheme": "", "host": "", "pathDir": "", "url": item}
+        if (item.length > 0) {
+            // Detect scheme:
+            var schemePos = item.search(":") 
+            entry.scheme = item.substring(0, schemePos)
+            if (schemePos < 0) schemePos = 0
+            else schemePos += 1
+
+            // path pos is probably after schemePos
+            var pathPos = schemePos
+            
+            // try to detect //userinfo@host:port
+            var token = item.substr(schemePos, 2);
+            if (token.search("//") == 0) {
+                pathPos += 2
+            }
+            item = item.substring(pathPos, item.length)
+            // item is now everything after scheme:[//]
+            var splitted = item.split('/')
+
+            // odd ball, the rest of the url has no other'/' ?
+            // in theory this means it s just the host info ?
+            // we are assuming that path ALWAYS starts with a slash
+            entry.host = splitted[0]
+            
+            if (splitted.length > 1) {           
+                entry.name = splitted[splitted.length - 1] 
+
+                // if splitted is longer than 2 then there should be a path dir
+                if (splitted.length > 2) {  
+                    for (var i = 1; i < splitted.length - 1; i++) {
+                        entry.pathDir += '/' +   splitted[i]   
+                    }
+                }
+            }
+        }
+        return entry
+    }
+
+
+    function resetItemList(itemList) {
+        currentItemsList = []
+        resourceItemsModel.clear()
+        for (var i in itemList) {
+            var item = itemList[i]
+            currentItemsList.push(item)
+            resourceItemsModel.append(packItemEntry(item, currentItemsList.length -1))
+        }
+        // At the end of it, force an update
+        visualModel.forceUpdate()   
+    }
+
+    function updateItemList(newItemList) {
+        resetItemList(newItemList) 
+    }
+
+    property var itemFields: ['identifier', 'name', 'scheme', 'host', 'pathDir', 'url']
+ 
+
+    Column {
+        id: header
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        
+        Item {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: totalCount.height
+            id: headerTop
+
+            Prop.PropButton {
+                id: refreshButton
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                text: "Refresh"
+                color: needFreshList ? global.colorOrangeAccent : global.fontColor 
+                onPressed: { pullFreshValues() }
+            }
+
+            GridLayout {
+                anchors.left: refreshButton.right
+                anchors.right: parent.right
+                id: headerCountLane
+                columns: 3
+
+                Item {
+                    Layout.fillWidth: true
+                    Prop.PropScalar {
+                        id: itemCount
+                        label: "Count"
+                        object: root.cache
+                        property: "numTotal" 
+                        integral: true
+                        readOnly: true
+                    }
+                }
+                Item {
+                    Layout.fillWidth: true
+                    Prop.PropScalar {
+                        id: totalCount
+                        label: "Count"
+                        object: root.cache
+                        property: "numTotal" 
+                        integral: true
+                        readOnly: true
+                        onSourceValueVarChanged: { updateItemListFromCache() }
+                    }
+                }
+                Item {
+                    Layout.fillWidth: true
+                    Prop.PropScalar {
+                        id: cachedCount
+                        label: "Cached"
+                        object: root.cache
+                        property: "numCached" 
+                        integral: true
+                        readOnly: true
+                        onSourceValueVarChanged: { updateItemListFromCache() }
+                    }
+                }
+            }
+        }
+        Item {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: orderSelector.height
+            
+            Prop.PropText {
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                width: 50
+                id: orderSelectorLabel
+                text: "Sort by"
+                horizontalAlignment: Text.AlignHCenter
+            }  
+            Prop.PropComboBox {
+                anchors.left: orderSelectorLabel.right
+                width: 80
+                id: orderSelector
+                model: itemFields
+                currentIndex: 1
+                
+                property var isSchemeVisible: (currentIndex == 2 || filterFieldSelector.currentIndex == 2)
+                property var isHostVisible: (currentIndex == 3 || filterFieldSelector.currentIndex == 3)
+                property var isPathDirVisible: (currentIndex == 4 || filterFieldSelector.currentIndex == 4)
+                property var isURLVisible: (currentIndex == 5 || filterFieldSelector.currentIndex == 5)
+            }
+
+            Prop.PropTextField {
+                anchors.left: orderSelector.right
+                anchors.right: filterFieldSelector.left
+                id: nameFilter
+                placeholderText: qsTr("Filter by " + itemFields[filterFieldSelector.currentIndex] + "...")
+                Layout.fillWidth: true
+            }
+            Prop.PropComboBox {
+                anchors.right: parent.right
+                id: filterFieldSelector
+                model: itemFields
+                currentIndex: 1
+                width: 80
+                opacity: (nameFilter.text.length > 0) ? 1.0 : 0.5
+            }
+        }
+    }
+
+    Component {
+        id: resouceItemDelegate
+        MouseArea {
+            id: dragArea
+            property bool held: false
+            anchors { left: parent.left; right: parent.right }
+            height: item.height
+            onPressed: {held = true}
+            onReleased: {held = false}
+            onDoubleClicked: { requestResourceDetails(model.url) }
+            Rectangle {
+                id: item
+                width: parent.width
+                height: global.slimHeight
+                color: dragArea.held ? global.colorBackHighlight : (index % 2 ? global.colorBackShadow : global.colorBack)              
+                Row {
+                    id: itemRow
+                    anchors.verticalCenter : parent.verticalCenter
+                    Prop.PropText {
+                        id: itemIdentifier
+                        text: model.identifier
+                        width: 30
+                    }
+                    Prop.PropSplitter {
+                        visible: orderSelector.isSchemeVisible
+                        size:8
+                    }
+                    Prop.PropLabel {
+                        visible: orderSelector.isSchemeVisible
+                        text: model.scheme
+                        width: 30
+                    }
+                    Prop.PropSplitter {
+                        visible: orderSelector.isHostVisible
+                        size:8
+                    }
+                    Prop.PropLabel {
+                        visible: orderSelector.isHostVisible
+                        text: model.host
+                        width: 150
+                    }
+                    Prop.PropSplitter {
+                        visible: orderSelector.isPathDirVisible
+                        size:8
+                    }
+                    Prop.PropLabel {
+                        visible: orderSelector.isPathDirVisible
+                        text: model.pathDir
+                    }
+                    Prop.PropSplitter {
+                        size:8
+                    }
+                    Prop.PropLabel {
+                        visible: !orderSelector.isURLVisible
+                        text: model.name
+                    }
+                    Prop.PropLabel {
+                        visible: orderSelector.isURLVisible
+                        text: model.url
+                    }
+                }
+            }
+            
+        }
+    }
+
+    Skit.SortFilterModel {
+        id: visualModel
+        model: ListModel {}
+
+        property int sortOrder: orderSelector.currentIndex
+
+        property var lessThanArray: [
+            function(left, right) { return left.index < right.index },
+            function(left, right) { return left.name < right.name },
+            function(left, right) { return left.scheme < right.scheme },
+            function(left, right) { return left.host < right.host },
+            function(left, right) { return left.pathDir < right.pathDir },
+            function(left, right) { return left.url < right.url }
+        ];
+        lessThan: lessThanArray[sortOrder]
+
+        property int filterField: filterFieldSelector.currentIndex
+        onFilterFieldChanged: { refreshFilter() }
+        property var textFilter: nameFilter.text
+        onTextFilterChanged: { refreshFilter() }
+        
+        function filterToken(itemWord, token) { return  (itemWord.search(token) > -1) }
+        property var acceptItemArray: [
+            function(item) { return true },
+            function(item) { return filterToken(item.identifier.toString(), textFilter) },
+            function(item) { return filterToken(item.name, textFilter) },
+            function(item) { return filterToken(item.scheme, textFilter) },
+            function(item) { return filterToken(item.host, textFilter) },
+            function(item) { return filterToken(item.pathDir, textFilter) },
+            function(item) { return filterToken(item.url, textFilter) }
+        ]
+
+        function refreshFilter() {
+            //console.log("refreshFilter! token = " + textFilter + " field = " + filterField)
+            acceptItem = acceptItemArray[(textFilter.length != 0) * + (1 + filterField)]
+        }
+
+        delegate: resouceItemDelegate
+    }
+
+    ListView {
+        anchors.top: header.bottom 
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        clip: true
+    
+        id: listView
+        model: visualModel
+    }
+}
diff --git a/scripts/developer/utilities/cache/cash/ResourceInspector.qml b/scripts/developer/utilities/cache/cash/ResourceInspector.qml
new file mode 100644
index 0000000000..099eb735d0
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/ResourceInspector.qml
@@ -0,0 +1,58 @@
+//
+//  ResourceInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-24
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.12
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+import QtQml.Models 2.12
+
+import "../../lib/prop" as Prop
+
+Item {
+    id: root;
+    Prop.Global { id: global }
+
+    anchors.fill: parent.fill
+    property var cache: {}
+    property string cacheResourceName: "" 
+
+    function fromScript(message) {
+        switch (message.method) {
+        case "inspectResource":
+            inspectResource(message.params.url, message.params.semantic)
+            break;
+        }
+    }
+
+    function inspectResource(url, semantic) {
+        console.log("inspectResource :" + url + " as " + semantic)
+        info.text = "url: " + url + "\nsemantic: " + semantic + "\n";
+
+        if (semantic == "Texture") {
+            var res = TextureCache.prefetch(url, 0)
+            info.text += JSON.stringify(res);
+        } else if (semantic == "Model") {
+            var res = ModelCache.prefetch(url)
+            info.text += JSON.stringify(res);
+        }
+    }
+
+    TextEdit {
+            id: info
+            anchors.fill: parent
+            text: "Click an object to get material JSON"
+            width: root.width
+            font.pointSize: 10
+            color: "#FFFFFF"
+            readOnly: true
+            selectByMouse: true
+            wrapMode: Text.WordWrap
+    }
+}
+
diff --git a/scripts/developer/utilities/cache/cash/SoundCacheInspector.qml b/scripts/developer/utilities/cache/cash/SoundCacheInspector.qml
new file mode 100644
index 0000000000..26b043469e
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/SoundCacheInspector.qml
@@ -0,0 +1,21 @@
+//
+//  SoundCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+import "../../lib/prop" as Prop
+
+ResourceCacheInspector {
+    id: root;
+    anchors.fill: parent.fill
+    cache: SoundCache
+    cacheResourceName: "Sound"
+}
diff --git a/scripts/developer/utilities/cache/cash/TextureCacheInspector.qml b/scripts/developer/utilities/cache/cash/TextureCacheInspector.qml
new file mode 100644
index 0000000000..9bfd663a4e
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/TextureCacheInspector.qml
@@ -0,0 +1,21 @@
+//
+//  TextureCacheInspector.qml
+//
+//  Created by Sam Gateau on 2019-09-17
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 2.5
+import QtQuick.Layouts 1.3
+
+import "../../lib/prop" as Prop
+
+ResourceCacheInspector {
+    id: root;
+    anchors.fill: parent.fill
+    cache: TextureCache
+    cacheResourceName: "Texture"
+}
diff --git a/scripts/developer/utilities/cache/cash/qmldir b/scripts/developer/utilities/cache/cash/qmldir
new file mode 100644
index 0000000000..8793a6b8f5
--- /dev/null
+++ b/scripts/developer/utilities/cache/cash/qmldir
@@ -0,0 +1,6 @@
+ResourceCacheInspector  1.0 ResourceCacheInspector.qml
+TextureCacheInspector  1.0 TextureCacheInspector.qml
+MaterialCacheInspector  1.0 MaterialCacheInspector.qml
+ModelCacheInspector  1.0 ModelCacheInspector.qml
+AnimationCacheInspector  1.0 AnimationCacheInspector.qml
+SoundCacheInspector  1.0 SoundCacheInspector.qml
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
index e2576fe783..a935163bd9 100644
--- a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
+++ b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
@@ -91,12 +91,12 @@ Rectangle {
         }
     }
 
-    Original.ScrollView {
+    ListView {
         anchors.fill: parent 
-        ListView {
-            id: theView
-            model: jobsModel
-            delegate: objRecursiveDelegate
-        }
+
+        id: theView
+        model: jobsModel
+        delegate: objRecursiveDelegate
     }
+    
 }
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/prop/PropEnum.qml b/scripts/developer/utilities/lib/prop/PropEnum.qml
index 2268b21e34..97c385281d 100644
--- a/scripts/developer/utilities/lib/prop/PropEnum.qml
+++ b/scripts/developer/utilities/lib/prop/PropEnum.qml
@@ -16,6 +16,7 @@ PropItem {
     id: root
 
     property alias enums : valueCombo.model
+    property alias currentIndex : valueCombo.currentIndex
 
     PropComboBox {
         id: valueCombo
diff --git a/scripts/developer/utilities/lib/prop/PropItem.qml b/scripts/developer/utilities/lib/prop/PropItem.qml
index 6d2f4c11ad..3779e7f4a9 100644
--- a/scripts/developer/utilities/lib/prop/PropItem.qml
+++ b/scripts/developer/utilities/lib/prop/PropItem.qml
@@ -25,19 +25,16 @@ Item {
     // 
     function defaultGet() { var v = root.object[root.property]; return v; }
     function defaultSet(value) { root.object[root.property] = value; }  
-   // function defaultSetReadOnly(value) { log ( "read only " + property + ", NOT setting to " + value); }  
- //   function defaultSetReadOnly(value) {}  
-  //  property var valueVarSetter: (root.readOnly ? defaultSetReadOnly : defaultSet)
-    property var valueVarSetter: defaultSet
+    function defaultSetReadOnly(value) {}   
+
+    property var valueVarSetter: (readOnly ? defaultSetReadOnly : defaultSet)
     property var valueVarGetter: defaultGet
 
     // PropItem is stretching horizontally accross its parent
     // Fixed height
+    height: global.lineHeight
     anchors.left: parent.left
     anchors.right: parent.right    
-    height: global.lineHeight
-    anchors.leftMargin: global.horizontalMargin
-    anchors.rightMargin: global.horizontalMargin
 
     // LabelControl And SplitterControl are on the left side of the PropItem
     property bool showLabel: true  
diff --git a/scripts/developer/utilities/lib/prop/PropScalar.qml b/scripts/developer/utilities/lib/prop/PropScalar.qml
index ce89342997..3776f5c4bc 100644
--- a/scripts/developer/utilities/lib/prop/PropScalar.qml
+++ b/scripts/developer/utilities/lib/prop/PropScalar.qml
@@ -32,9 +32,7 @@ PropItem {
     property var sourceValueVar: root.valueVarGetter()
 
     function applyValueVarFromWidgets(value) {
-        if (!root.readOnly) { 
-           root.valueVarSetter(value)
-        }
+        root.valueVarSetter(value)
     }
 
     PropLabel {
@@ -58,6 +56,7 @@ PropItem {
 
         MouseArea{
             id: mousearea
+            enabled: !root.readOnly
             anchors.fill: parent
             onDoubleClicked: { sliderControl.visible = !sliderControl.visible }
         }
diff --git a/scripts/developer/utilities/lib/prop/qmldir b/scripts/developer/utilities/lib/prop/qmldir
index e09785846d..99e721fb33 100644
--- a/scripts/developer/utilities/lib/prop/qmldir
+++ b/scripts/developer/utilities/lib/prop/qmldir
@@ -1,8 +1,10 @@
 Module Prop
 Global 1.0 style/Global.qml
 PropText 1.0 style/PiText.qml
+PropTextField 1.0 style/PiTextField.qml
 PropLabel 1.0 style/PiLabel.qml
 PropSplitter 1.0 style/PiSplitter.qml
+PropButton 1.0 style/PiButton.qml
 PropComboBox 1.0 style/PiComboBox.qml
 PropCanvasIcon 1.0 style/PiCanvasIcon.qml
 PropCheckBox 1.0 style/PiCheckBox.qml
diff --git a/scripts/developer/utilities/lib/prop/style/PiButton.qml b/scripts/developer/utilities/lib/prop/style/PiButton.qml
new file mode 100644
index 0000000000..5469431d81
--- /dev/null
+++ b/scripts/developer/utilities/lib/prop/style/PiButton.qml
@@ -0,0 +1,35 @@
+//
+//  Prop/style/PiButton.qml
+//
+//  Created by Sam Gateau on 17/09/2019
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.6
+import QtQuick.Controls 2.1
+
+Button {
+    Global { id: global }
+    id: control
+    text: ""
+    spacing: 0
+    property alias color: theContentItem.color
+
+    contentItem: PiText {
+        id: theContentItem
+        text: control.text
+        horizontalAlignment: Text.AlignHCenter
+        color: global.fontColor
+    }
+
+    background: Rectangle {
+        color: control.down ? global.colorBackHighlight : global.colorBackShadow 
+        opacity: enabled ? 1 : 0.3
+        border.color: control.down ? global.colorBorderHighight : (control.hovered ? global.colorBorderHighight : global.colorBorderLight)
+        border.width: global.valueBorderWidth
+        radius: global.valueBorderRadius
+    }
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/prop/style/PiComboBox.qml b/scripts/developer/utilities/lib/prop/style/PiComboBox.qml
index 92164fefc5..9430228eba 100644
--- a/scripts/developer/utilities/lib/prop/style/PiComboBox.qml
+++ b/scripts/developer/utilities/lib/prop/style/PiComboBox.qml
@@ -16,7 +16,9 @@ ComboBox {
     id: valueCombo
 
     height: global.slimHeight
-
+    width: 120
+    implicitHeight: global.slimHeight
+       
 
     // look
     flat: true
@@ -51,8 +53,6 @@ ComboBox {
     }
 
     background: Rectangle {
-        implicitWidth: 120
-        implicitHeight: 40
         color: global.colorBack
         border.color: valueCombo.popup.visible ? global.colorBorderLighter : global.colorBorderLight
         border.width: global.valueBorderWidth
diff --git a/scripts/developer/utilities/lib/prop/style/PiTextField.qml b/scripts/developer/utilities/lib/prop/style/PiTextField.qml
new file mode 100644
index 0000000000..8dfb9d88ee
--- /dev/null
+++ b/scripts/developer/utilities/lib/prop/style/PiTextField.qml
@@ -0,0 +1,31 @@
+//
+//  Prop/style/PiTextField.qml
+//
+//  Created by Sam Gateau on 9/24/2019
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+TextField {
+    id: control
+    Global { id: global }
+    implicitHeight: global.slimHeight
+    implicitWidth: 200
+
+    placeholderText: qsTr("Enter description")
+
+    color: global.fontColor
+    font.pixelSize: global.fontSize
+    font.family: global.fontFamily
+    font.weight: global.fontWeight
+
+    background: Rectangle {
+        color: (control.text.length > 0) ? global.colorBackHighlight : global.colorBackShadow
+        border.color: (control.text.length > 0) ? global.colorBorderHighight : "transparent"
+    }
+}
diff --git a/scripts/developer/utilities/render/luci/Page.js b/scripts/developer/utilities/lib/skit/Page.js
similarity index 69%
rename from scripts/developer/utilities/render/luci/Page.js
rename to scripts/developer/utilities/lib/skit/Page.js
index 06c9704abf..189c26044a 100644
--- a/scripts/developer/utilities/render/luci/Page.js
+++ b/scripts/developer/utilities/lib/skit/Page.js
@@ -10,11 +10,12 @@
 "use strict";
 
 (function() {
-function Page(title, qmlurl, width, height, onViewCreated, onViewClosed) {
+function Page(title, qmlurl, width, height, onFromQml, onViewCreated, onViewClosed) {
     this.title = title;
-    this.qml = qmlurl;
+    this.qmlurl = qmlurl;
     this.width = width;
     this.height = height;
+    this.onFromQml = onFromQml;
     this.onViewCreated = onViewCreated;
     this.onViewClosed = onViewClosed;
 
@@ -30,6 +31,9 @@ Page.prototype.killView = function () {
         //this.window.closed.disconnect(function () {
         //    this.killView();
         //});
+        if (this.onFromQml) {
+            this.window.fromQml.disconnect(this.onFromQml)
+        }
         this.window.close();
         this.window = false;
     }
@@ -39,12 +43,15 @@ Page.prototype.createView = function () {
     var that = this;
     if (!this.window) {
         print("Page: New window for page:" + this.title);
-        this.window = Desktop.createWindow(Script.resolvePath(this.qml), {
+        this.window = Desktop.createWindow(this.qmlurl, {
             title: this.title,
             presentationMode: Desktop.PresentationMode.NATIVE,
             size: {x: this.width, y: this.height}
         });
         this.onViewCreated(this.window);
+        if (this.onFromQml) {
+            this.window.fromQml.connect(this.onFromQml)
+        }
         this.window.closed.connect(function () {
             that.killView();
             that.onViewClosed();
@@ -53,11 +60,13 @@ Page.prototype.createView = function () {
 };
 
 
-Pages = function () {
+Pages = function (relativePath) {
+    print(relativePath)
+    this._relativePath = relativePath
     this._pages = {};
 };
 
-Pages.prototype.addPage = function (command, title, qmlurl, width, height, onViewCreated, onViewClosed) {
+Pages.prototype.addPage = function (command, title, qmlurl, width, height, onFromQml, onViewCreated, onViewClosed) {
     if (onViewCreated === undefined) {
         // Workaround for bad linter
         onViewCreated = function(window) {};
@@ -66,7 +75,7 @@ Pages.prototype.addPage = function (command, title, qmlurl, width, height, onVie
         // Workaround for bad linter
         onViewClosed = function() {};
     }
-    this._pages[command] = new Page(title, qmlurl, width, height, onViewCreated, onViewClosed);
+    this._pages[command] = new Page(title, Script.resolvePath(this._relativePath + qmlurl), width, height, onFromQml, onViewCreated, onViewClosed);
 };
 
 Pages.prototype.open = function (command) {
@@ -87,4 +96,12 @@ Pages.prototype.clear = function () {
     this._pages = {};
 };
 
+Pages.prototype.sendTo = function (command, message) {
+    if (!this._pages[command]) {
+        print("Pages: unknown command = " + command);
+        return;
+    }
+    this._pages[command].window.sendToQml(message);
+};
+
 }()); 
diff --git a/scripts/developer/utilities/lib/skit/qml/SortFilterModel.qml b/scripts/developer/utilities/lib/skit/qml/SortFilterModel.qml
new file mode 100644
index 0000000000..08ad8d1dbd
--- /dev/null
+++ b/scripts/developer/utilities/lib/skit/qml/SortFilterModel.qml
@@ -0,0 +1,93 @@
+import QtQuick 2.9
+import QtQml.Models 2.3
+
+DelegateModel {
+    id: delegateModel
+
+    property var lessThan: function(left, right) { return true; }
+    property var acceptItem: function(item) { return true; }
+
+    function insertPosition(lessThanFunctor, item) {
+        var lower = 0
+        var upper = visibleItems.count
+        while (lower < upper) {
+            var middle = Math.floor(lower + (upper - lower) / 2)
+            var result = lessThanFunctor(item.model, visibleItems.get(middle).model);
+            if (result) {
+                upper = middle
+            } else {
+                lower = middle + 1
+            }
+        }
+        return lower
+    }
+
+    function sortAndFilter(lessThanFunctor, acceptItemFunctor) {
+        while (unsortedItems.count > 0) {
+            var item = unsortedItems.get(0)
+            
+            if (acceptItemFunctor(item.model)) {
+                var index = insertPosition(lessThanFunctor, item)
+
+                item.groups = ["items","visible"]
+                visibleItems.move(item.visibleIndex, index)
+            } else {
+                item.groups = ["items"]
+            }
+        }
+    }
+
+    // Private bool to track when items changed and view is dirty
+    property bool itemsDirty: true
+    function update() {
+        console.log("SortFilterMode: update and sort and filter items !!" + items.count);
+        if (items.count > 0) {
+            items.setGroups(0, items.count, ["items","unsorted"]);
+        }
+
+        sortAndFilter(lessThan, acceptItem)
+        itemsDirty = false;
+        itemsUpdated()
+    }
+
+    signal itemsUpdated()
+
+    function updateOnItemsChanged() {
+        itemsDirty = true;
+        if (isAutoUpdateOnChanged) {
+            update()
+        }
+    }
+
+    property bool isAutoUpdateOnChanged: false
+    function setAutoUpdateOnChanged(enabled) {
+        isAutoUpdateOnChanged = enabled
+        if (enabled) {
+            update()
+        }
+    }
+
+    function forceUpdate() {
+        update();
+    }
+    items.onChanged: updateOnItemsChanged()
+    onLessThanChanged: update()
+    onAcceptItemChanged: update()
+
+    groups: [
+        DelegateModelGroup {
+            id: visibleItems
+
+            name: "visible"
+            includeByDefault: false
+        },
+        DelegateModelGroup {
+            id: unsortedItems
+
+            name: "unsorted"
+            includeByDefault: false
+        }
+    ]
+
+    filterOnGroup: "visible"
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/skit/qml/qmldir b/scripts/developer/utilities/lib/skit/qml/qmldir
new file mode 100644
index 0000000000..14d11d998a
--- /dev/null
+++ b/scripts/developer/utilities/lib/skit/qml/qmldir
@@ -0,0 +1 @@
+SortFilterModel  1.0 SortFilterModel.qml
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/bloom.qml b/scripts/developer/utilities/render/bloom.qml
deleted file mode 100644
index 705a9826d6..0000000000
--- a/scripts/developer/utilities/render/bloom.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//  bloom.qml
-//  developer/utilities/render
-//
-//  Olivier Prat, created on 09/25/2017.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
-//
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import "configSlider"
-
-Item {
-    id: root
-    property var configDebug: Render.getConfig("RenderMainView.DebugBloom")
-
-    Column {
-        spacing: 8
-
-        GroupBox {
-            title: "Debug"
-            Row {
-                ExclusiveGroup { id: debugGroup }
-                RadioButton {
-                    text : "Off"
-                    checked : !root.configDebug["enabled"]
-                    onCheckedChanged: {
-                        if (checked) {
-                            root.configDebug["enabled"] = false
-                        }
-                    }
-                    exclusiveGroup : debugGroup
-                }
-                RadioButton {
-                    text : "Lvl 0"
-                    checked :root.configDebug["enabled"] && root.configDebug["mode"]==0
-                    onCheckedChanged: {
-                        if (checked) {
-                            root.configDebug["enabled"] = true
-                            root.configDebug["mode"] = 0
-                        }
-                    }
-                    exclusiveGroup : debugGroup
-                }
-                RadioButton {
-                    text : "Lvl 1"
-                    checked : root.configDebug["enabled"] && root.configDebug["mode"]==1
-                    onCheckedChanged: {
-                        if (checked) {
-                            root.configDebug["enabled"] = true
-                            root.configDebug["mode"] = 1
-                        }
-                    }
-                    exclusiveGroup : debugGroup
-                }
-                RadioButton {
-                    text : "Lvl 2"
-                    checked : root.configDebug["enabled"] && root.configDebug["mode"]==2
-                    onCheckedChanged: {
-                        if (checked) {
-                            root.configDebug["enabled"] = true
-                            root.configDebug["mode"] = 2
-                        }
-                    }
-                    exclusiveGroup : debugGroup
-                }
-                RadioButton {
-                    text : "All"
-                    checked : root.configDebug["enabled"] && root.configDebug["mode"]==3
-                    onCheckedChanged: {
-                        if (checked) {
-                            root.configDebug["enabled"] = true
-                            root.configDebug["mode"] = 3
-                        }
-                    }
-                    exclusiveGroup : debugGroup
-                }
-            }
-        }
-    }
-}
diff --git a/scripts/developer/utilities/render/debugBloom.js b/scripts/developer/utilities/render/debugBloom.js
index 39629ab0ce..3c5e722a18 100644
--- a/scripts/developer/utilities/render/debugBloom.js
+++ b/scripts/developer/utilities/render/debugBloom.js
@@ -10,11 +10,8 @@
 //
 
 // Set up the qml ui
-var qml = Script.resolvePath('bloom.qml');
-var window = new OverlayWindow({
-    title: 'Bloom',
-    source: qml,
-    width: 285, 
-    height: 40,
-});
-window.closed.connect(function() { Script.stop(); });
\ No newline at end of file
+var window = Desktop.createWindow(Script.resolvePath('./luci/Bloom.qml'), {
+    title: "Bloom",
+    presentationMode: Desktop.PresentationMode.NATIVE,
+    size: {x: 285, y: 40}
+});
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml
deleted file mode 100644
index f2891ddc55..0000000000
--- a/scripts/developer/utilities/render/deferredLighting.qml
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  deferredLighting.qml
-//
-//  Created by Sam Gateau on 6/6/2016
-//  Copyright 2016 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
-//
-import QtQuick 2.7
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.3
-
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControls
-import  "configSlider"
-import "luci"
-
-Rectangle {
-    HifiConstants { id: hifi;}
-    id: render;   
-    anchors.margins: hifi.dimensions.contentMargin.x
-    
-    color: hifi.colors.baseGray;
-    property var mainViewTask: Render.getConfig("RenderMainView")
-   
-    Column {
-        spacing: 5
-        anchors.left: parent.left
-        anchors.right: parent.right       
-        anchors.margins: hifi.dimensions.contentMargin.x  
-        
-        
-        HifiControls.Label {
-                    text: "Shading"       
-        }
-        ShadingModel {}
-
-        Separator {}  
-        ToneMapping {}
-
-        Separator {}          
-        Column {
-            anchors.left: parent.left
-            anchors.right: parent.right 
-            spacing: 5 
-            Repeater {
-                model: [ "MSAA:PreparePrimaryBufferForward:numSamples:4:1"
-                              ]
-                ConfigSlider {
-                        label: qsTr(modelData.split(":")[0])
-                        integral: true
-                        config: render.mainViewTask.getConfig(modelData.split(":")[1])
-                        property: modelData.split(":")[2]
-                        max: modelData.split(":")[3]
-                        min: modelData.split(":")[4]
-
-                        anchors.left: parent.left
-                        anchors.right: parent.right 
-                }
-            }
-        }
-        Separator {}          
-        Framebuffer {}
-        
-        Separator {}          
-        BoundingBoxes {
-
-        }
-        Separator {}
-        Row {
-            HifiControls.Button {
-                text: "Engine"
-            // activeFocusOnPress: false
-                onClicked: {
-                sendToScript({method: "openEngineView"}); 
-                }
-            }
-            HifiControls.Button {
-                text: "LOD"
-            // activeFocusOnPress: false
-                onClicked: {
-                sendToScript({method: "openEngineLODView"}); 
-                }
-            }
-            HifiControls.Button {
-                text: "Cull"
-            // activeFocusOnPress: false
-                onClicked: {
-                sendToScript({method: "openCullInspectorView"}); 
-                }
-            }
-        }
-        Row {
-            HifiControls.Button {
-                text: "Material"
-                onClicked: {
-                sendToScript({method: "openMaterialInspectorView"}); 
-                }
-            }
-        }
-    }
-}
diff --git a/scripts/developer/utilities/render/luci.js b/scripts/developer/utilities/render/luci.js
index fd84f55e65..3b832bdfb4 100644
--- a/scripts/developer/utilities/render/luci.js
+++ b/scripts/developer/utilities/render/luci.js
@@ -1,57 +1,12 @@
-"use strict";
-
-//
-//  Luci.js
-//  tablet-engine app
-//
-//  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
-//
 
 
+var MaterialInspector = Script.require('./materialInspector.js');
 
-(function() {
-    var AppUi = Script.require('appUi');
-    
-    var MaterialInspector = Script.require('./materialInspector.js');
-    var Page = Script.require('./luci/Page.js');
-
-    var moveDebugCursor = false;
-    var onMousePressEvent = function (e) {
-        if (e.isMiddleButton) {
-            moveDebugCursor = true;
-            setDebugCursor(e.x, e.y);
-        }
-    };
-    Controller.mousePressEvent.connect(onMousePressEvent);
-
-    var onMouseReleaseEvent = function () {
-        moveDebugCursor = false;
-    };
-    Controller.mouseReleaseEvent.connect(onMouseReleaseEvent);
-
-    var onMouseMoveEvent = function (e) {
-        if (moveDebugCursor) {
-            setDebugCursor(e.x, e.y);
-        }
-    };
-    Controller.mouseMoveEvent.connect(onMouseMoveEvent);
-
-    function setDebugCursor(x, y) {
-        var nx = 2.0 * (x / Window.innerWidth) - 1.0;
-        var ny = 1.0 - 2.0 * ((y) / (Window.innerHeight));
-
-        Render.getConfig("RenderMainView").getConfig("DebugDeferredBuffer").size = { x: nx, y: ny, z: 1.0, w: 1.0 };
-    }
+var Page = Script.require('../lib/skit/Page.js');
 
 
-    var pages = new Pages();
-
-    pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400);
-    pages.addPage('openCullInspectorView', 'Cull Inspector', '../luci/Culling.qml', 300, 400);
-    pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow);
+function openView() {
+    var pages = new Pages(Script.resolvePath("."));
 
     function fromQml(message) {
         if (pages.open(message.method)) {
@@ -59,22 +14,61 @@
         }    
     }
 
-    var ui;
-    function startup() {
-        ui = new AppUi({
-            buttonName: "LUCI",
-            home: Script.resolvePath("deferredLighting.qml"),
-            additionalAppScreens : Script.resolvePath("engineInspector.qml"),
-            onMessage: fromQml,
-            normalButton: Script.resolvePath("../../../system/assets/images/luci-i.svg"),
-            activeButton: Script.resolvePath("../../../system/assets/images/luci-a.svg")
-        });
+    var luciWindow  
+    function openLuciWindow(window) {
+        luciWindow = window;
+
+
+        var moveDebugCursor = false;
+        var onMousePressEvent = function (e) {
+            if (e.isMiddleButton) {
+                moveDebugCursor = true;
+                setDebugCursor(e.x, e.y);
+            }
+        };
+        Controller.mousePressEvent.connect(onMousePressEvent);
+    
+        var onMouseReleaseEvent = function () {
+            moveDebugCursor = false;
+        };
+        Controller.mouseReleaseEvent.connect(onMouseReleaseEvent);
+    
+        var onMouseMoveEvent = function (e) {
+            if (moveDebugCursor) {
+                setDebugCursor(e.x, e.y);
+            }
+        };
+        Controller.mouseMoveEvent.connect(onMouseMoveEvent);
+    
+        function setDebugCursor(x, y) {
+            var nx = 2.0 * (x / Window.innerWidth) - 1.0;
+            var ny = 1.0 - 2.0 * ((y) / (Window.innerHeight));
+    
+            Render.getConfig("RenderMainView").getConfig("DebugDeferredBuffer").size = { x: nx, y: ny, z: 1.0, w: 1.0 };
+        }
+
     }
-    startup();
-    Script.scriptEnding.connect(function () {
+
+    function closeLuciWindow() {
+        luciWindow = {};
+
         Controller.mousePressEvent.disconnect(onMousePressEvent);
         Controller.mouseReleaseEvent.disconnect(onMouseReleaseEvent);
         Controller.mouseMoveEvent.disconnect(onMouseMoveEvent);
         pages.clear();
-    });
-}()); 
+    }
+
+    pages.addPage('Luci', 'Luci', 'luci.qml', 300, 420, fromQml, openLuciWindow, closeLuciWindow);
+    pages.addPage('openEngineInspectorView', 'Render Engine Inspector', 'engineInspector.qml', 300, 400);
+    pages.addPage('openEngineLODView', 'Render LOD', 'lod.qml', 300, 400);
+    pages.addPage('openMaterialInspectorView', 'Material Inspector', 'materialInspector.qml', 300, 400, null, MaterialInspector.setWindow, MaterialInspector.setWindow);
+
+    pages.open('Luci');
+
+    
+    return pages;
+}
+
+
+openView();
+
diff --git a/scripts/developer/utilities/render/luci.qml b/scripts/developer/utilities/render/luci.qml
index d768acb160..71962992b8 100644
--- a/scripts/developer/utilities/render/luci.qml
+++ b/scripts/developer/utilities/render/luci.qml
@@ -72,6 +72,12 @@ Rectangle {
                     Antialiasing {}
                 }
             }
+            Prop.PropFolderPanel {
+                label: "Bloom"
+                panelFrameData: Component {
+                    Bloom {}
+                }
+            }
             Prop.PropFolderPanel {
                 label: "Culling"
                 panelFrameData: Component {
diff --git a/scripts/developer/utilities/render/luci/Antialiasing.qml b/scripts/developer/utilities/render/luci/Antialiasing.qml
index 6d1209157f..2a52dfed46 100644
--- a/scripts/developer/utilities/render/luci/Antialiasing.qml
+++ b/scripts/developer/utilities/render/luci/Antialiasing.qml
@@ -22,15 +22,12 @@ import "../../lib/prop" as Prop
 
     
 Column{
-    HifiConstants { id: hifi; }
+    id: antialiasing
 
-            id: antialiasing
-    padding: 10
     anchors.left: parent.left
     anchors.right: parent.right 
 
-    spacing: 10
-     Prop.PropScalar {
+    Prop.PropScalar {
         label: "MSAA"
         object: Render.getConfig("RenderMainView.PreparePrimaryBufferForward")
         property: "numSamples"
@@ -38,49 +35,44 @@ Column{
         max: 32
         integral: true
     }
-    Row {
-        spacing: 10
-        id: fxaaOnOff
-        property bool debugFXAA: false
-        HifiControls.Button {
-            function getTheText() {
-                    if (Render.getConfig("RenderMainView.Antialiasing").fxaaOnOff) {
-                        return "FXAA"
-                    } else {
-                        return "TAA"
-                    }
-                }
-            text: getTheText()
-            onClicked: {
-                var onOff = !Render.getConfig("RenderMainView.Antialiasing").fxaaOnOff;
-                    if (onOff) {
-                    Render.getConfig("RenderMainView.JitterCam").none();
-                    Render.getConfig("RenderMainView.Antialiasing").fxaaOnOff = true;
-                    } else {
-                    Render.getConfig("RenderMainView.JitterCam").play();
-                    Render.getConfig("RenderMainView.Antialiasing").fxaaOnOff = false;
-                    }
-                    
-            }
-        }
+
+    Prop.PropEnum {
+        label: "Deferred AA Method"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "mode"
+        enums: [
+            "Off",
+            "TAA",
+            "FXAA",
+                ]
+    }
+    Prop.PropEnum {
+        id: jitter
+        label: "Jitter"
+        object: Render.getConfig("RenderMainView.JitterCam")
+        property: "state"
+        enums: [
+            "Off",
+            "On",
+            "Paused",
+                ]
     }
     Separator {}          
+
+    Prop.PropScalar {
+        visible: (Render.getConfig("RenderMainView.JitterCam").state == 2)
+        label: "Sample Index"
+        object: Render.getConfig("RenderMainView.JitterCam")
+        property: "index"
+      //  min: -1
+      //  max: 32
+        readOnly: true
+        integral: true
+    }
     Row {
+        visible: (Render.getConfig("RenderMainView.JitterCam").state == 2)
         spacing: 10
-        
-        HifiControls.Button {
-            text: {
-                var state = 2 - (Render.getConfig("RenderMainView.JitterCam").freeze * 1 - Render.getConfig("RenderMainView.JitterCam").stop * 2); 
-                if (state === 2) {
-                    return "Jitter"
-                } else if  (state === 1) {
-                    return "Paused at " + Render.getConfig("RenderMainView.JitterCam").index + ""
-                } else {
-                    return "No Jitter"
-                }
-                }
-            onClicked: { Render.getConfig("RenderMainView.JitterCam").cycleStopPauseRun(); }
-        }
+
         HifiControls.Button {
             text: "<"
             onClicked: { Render.getConfig("RenderMainView.JitterCam").prev(); }
@@ -90,96 +82,75 @@ Column{
             onClicked: { Render.getConfig("RenderMainView.JitterCam").next(); }
         }
     }
-    Separator {}          
-    HifiControls.CheckBox {
-        boxSize: 20
-        text: "Constrain color"
-        checked: Render.getConfig("RenderMainView.Antialiasing")["constrainColor"]
-        onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["constrainColor"] = checked }
-    }
-    ConfigSlider {
-        label: qsTr("Covariance gamma")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    Separator {}
+    Prop.PropBool {
+        label: "Constrain color"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "constrainColor"
+    }         
+    Prop.PropScalar {
+        label: "Covariance gamma"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "covarianceGamma"
         max: 1.5
         min: 0.5
-        height: 38
-    }                          
-    Separator {}          
-    HifiControls.CheckBox {
-        boxSize: 20
-        text: "Feedback history color"
-        checked: Render.getConfig("RenderMainView.Antialiasing")["feedbackColor"]
-        onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["feedbackColor"] = checked }
-    }
-
-    ConfigSlider {
-        label: qsTr("Source blend")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    }                       
+    Separator {}
+    Prop.PropBool {
+        label: "Feedback history color"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "feedbackColor"
+    }           
+    Prop.PropScalar {
+        label: "Source blend"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "blend"
         max: 1.0
         min: 0.0
-        height: 38
     }
-
-    ConfigSlider {
-        label: qsTr("Post sharpen")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    Prop.PropScalar {
+        label: "Post sharpen"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "sharpen"
         max: 1.0
         min: 0.0
     }
-    Separator {}                      
-    Row {
-
-        spacing: 10
-        HifiControls.CheckBox {
-            boxSize: 20
-            text: "Debug"
-            checked: Render.getConfig("RenderMainView.Antialiasing")["debug"]
-            onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["debug"] = checked }
-        }
-        HifiControls.CheckBox {
-            boxSize: 20
-            text: "Show Debug Cursor"
-            checked: Render.getConfig("RenderMainView.Antialiasing")["showCursorPixel"]
-            onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showCursorPixel"] = checked }
-        }
-    }
-    ConfigSlider {
-        label: qsTr("Debug Region <")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    Separator {}
+    Prop.PropBool {
+        label: "Debug"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "debug"
+    }   
+    Prop.PropBool {
+        label: "Show Debug Cursor"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "showCursorPixel"
+    }                         
+    Prop.PropScalar {
+        label: "Debug Region <"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "debugX"
         max: 1.0
         min: 0.0
     }
-    HifiControls.CheckBox {
-        boxSize: 20
-        text: "Closest Fragment"
-        checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"]
-        onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked }
-    }           
-    ConfigSlider {
-        label: qsTr("Debug Velocity Threshold [pix]")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    Prop.PropBool {
+        label: "Closest Fragment"
+        object: Render.getConfig("RenderMainView.Antialiasing")
+        property: "showClosestFragment"
+    }
+    Prop.PropScalar {
+        label: "Debug Velocity Threshold [pix]"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "debugShowVelocityThreshold"
         max: 50
         min: 0.0
-        height: 38
     }
-    ConfigSlider {
-        label: qsTr("Debug Orb Zoom")
-        integral: false
-        config: Render.getConfig("RenderMainView.Antialiasing")
+    Prop.PropScalar {
+        label: "Debug Orb Zoom"
+        object: Render.getConfig("RenderMainView.Antialiasing")
         property: "debugOrbZoom"
         max: 32.0
         min: 1.0
-        height: 38
-    }    
+    } 
 }
 
diff --git a/scripts/developer/utilities/render/luci/Bloom.qml b/scripts/developer/utilities/render/luci/Bloom.qml
new file mode 100644
index 0000000000..7db75d94ef
--- /dev/null
+++ b/scripts/developer/utilities/render/luci/Bloom.qml
@@ -0,0 +1,48 @@
+//
+//  bloom.qml
+//
+//  Olivier Prat, created on 09/25/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import "../../lib/prop" as Prop
+
+Column {
+    anchors.left: parent.left
+    anchors.right: parent.right 
+
+    id: bloom
+
+    property var config: Render.getConfig("RenderMainView.DebugBloom")
+
+    Prop.PropBool {
+        label: "Apply Bloom"
+        object: Render.getConfig("RenderMainView.LightingModel")
+        property: "enableBloom"
+    } 
+    
+    function setDebugMode(mode) {
+        console.log("Bloom mode is " + mode)
+        bloom.config.enabled = (mode != 0);
+        bloom.config.mode = mode;
+    }
+
+    Prop.PropEnum {
+        label: "Debug Bloom Buffer"
+       // object: config
+       // property: "mode"
+        enums: [
+            "Off",
+            "Lvl 0",
+            "Lvl 1",
+            "Lvl 2",
+            "All",
+                ]
+
+        valueVarSetter: function (mode) { bloom.setDebugMode(mode) }
+    }
+}
+
diff --git a/scripts/developer/utilities/render/luci/BoundingBoxes.qml b/scripts/developer/utilities/render/luci/BoundingBoxes.qml
index 636267729c..6b34e41b4c 100644
--- a/scripts/developer/utilities/render/luci/BoundingBoxes.qml
+++ b/scripts/developer/utilities/render/luci/BoundingBoxes.qml
@@ -54,7 +54,7 @@ Column {
             Prop.PropCheckBox {
                 text: "Zones"
                 checked: root.mainViewTask.getConfig("DrawZones")["enabled"]
-                onCheckedChanged: { root.mainViewTask.getConfig("ZoneRenderer")["enabled"] = checked; root.mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
+                onCheckedChanged: { root.mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
             }  
         }
         Column {
diff --git a/scripts/developer/utilities/render/luci/ShadingModel.qml b/scripts/developer/utilities/render/luci/ShadingModel.qml
index 78ca7f1740..afeca5a204 100644
--- a/scripts/developer/utilities/render/luci/ShadingModel.qml
+++ b/scripts/developer/utilities/render/luci/ShadingModel.qml
@@ -35,7 +35,8 @@ Column {
                         "Emissive:LightingModel:enableEmissive", 
                         "Lightmap:LightingModel:enableLightmap",
                         "Background:LightingModel:enableBackground",      
-                        "Haze:LightingModel:enableHaze",                        
+                        "Haze:LightingModel:enableHaze", 
+                        "Bloom:LightingModel:enableBloom", 
                         "AO:LightingModel:enableAmbientOcclusion",
                         "Textures:LightingModel:enableMaterialTexturing"                     
                 ]
diff --git a/scripts/developer/utilities/render/luci/qmldir b/scripts/developer/utilities/render/luci/qmldir
index 3ebd9fcd8d..a4059ffcab 100644
--- a/scripts/developer/utilities/render/luci/qmldir
+++ b/scripts/developer/utilities/render/luci/qmldir
@@ -5,6 +5,7 @@ BoundingBoxes 1.0 BoundingBoxes.qml
 Framebuffer 1.0 Framebuffer.qml
 Antialiasing 1.0 Antialiasing.qml
 Culling 1.0 Culling.qml
+Bloom 1.0 Bloom.qml
 
 Platform 1.0 Platform.qml
 RenderSettings 1.0 RenderSettings.qml
diff --git a/scripts/developer/utilities/render/luci2.js b/scripts/developer/utilities/render/luci2.js
deleted file mode 100644
index e2e5523ccd..0000000000
--- a/scripts/developer/utilities/render/luci2.js
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-var MaterialInspector = Script.require('./materialInspector.js');
-var Page = Script.require('./luci/Page.js');
-
-
-function openView() {
-    //window.closed.connect(function() { Script.stop(); });
-
-
-    var pages = new Pages();
-    function fromQml(message) {
-        if (pages.open(message.method)) {
-            return;
-        }    
-    }
-
-    var luciWindow  
-    function openLuciWindow(window) {
-        if (luciWindow !== undefined) {
-            activeWindow.fromQml.disconnect(fromQml);
-        }
-        if (window !== undefined) {
-            window.fromQml.connect(fromQml);
-        }
-        luciWindow = window;
-
-
-        var moveDebugCursor = false;
-        var onMousePressEvent = function (e) {
-            if (e.isMiddleButton) {
-                moveDebugCursor = true;
-                setDebugCursor(e.x, e.y);
-            }
-        };
-        Controller.mousePressEvent.connect(onMousePressEvent);
-    
-        var onMouseReleaseEvent = function () {
-            moveDebugCursor = false;
-        };
-        Controller.mouseReleaseEvent.connect(onMouseReleaseEvent);
-    
-        var onMouseMoveEvent = function (e) {
-            if (moveDebugCursor) {
-                setDebugCursor(e.x, e.y);
-            }
-        };
-        Controller.mouseMoveEvent.connect(onMouseMoveEvent);
-    
-        function setDebugCursor(x, y) {
-            var nx = 2.0 * (x / Window.innerWidth) - 1.0;
-            var ny = 1.0 - 2.0 * ((y) / (Window.innerHeight));
-    
-            Render.getConfig("RenderMainView").getConfig("DebugDeferredBuffer").size = { x: nx, y: ny, z: 1.0, w: 1.0 };
-        }
-
-    }
-
-    function closeLuciWindow() {
-        if (luciWindow !== undefined) {
-            activeWindow.fromQml.disconnect(fromQml);
-        }
-        luciWindow = {};
-
-        Controller.mousePressEvent.disconnect(onMousePressEvent);
-        Controller.mouseReleaseEvent.disconnect(onMouseReleaseEvent);
-        Controller.mouseMoveEvent.disconnect(onMouseMoveEvent);
-        pages.clear();
-    }
-
-    pages.addPage('Luci', 'Luci', '../luci.qml', 300, 420, openLuciWindow, closeLuciWindow);
-    pages.addPage('openEngineInspectorView', 'Render Engine Inspector', '../engineInspector.qml', 300, 400);
-    pages.addPage('openEngineLODView', 'Render LOD', '../lod.qml', 300, 400);
-    pages.addPage('openMaterialInspectorView', 'Material Inspector', '../materialInspector.qml', 300, 400, MaterialInspector.setWindow, MaterialInspector.setWindow);
-
-    pages.open('Luci');
-
-    
-    return pages;
-}
-
-
-openView();
-
diff --git a/scripts/developer/utilities/render/materialInspector.js b/scripts/developer/utilities/render/materialInspector.js
index 98d9f769fb..8a7d5ad7dd 100644
--- a/scripts/developer/utilities/render/materialInspector.js
+++ b/scripts/developer/utilities/render/materialInspector.js
@@ -128,7 +128,7 @@ function fromQml(message) {
 
 var SELECT_LIST = "luci_materialInspector_SelectionList";
 Selection.enableListHighlight(SELECT_LIST, {
-    outlineUnoccludedColor: { red: 255, green: 255, blue: 255 }
+    outlineUnoccludedColor: { red: 125, green: 255, blue: 225 }
 });
 function setSelectedObject(id, type) {
     Selection.clearSelectedItemsList(SELECT_LIST);
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav
deleted file mode 100644
index 3d917997a7..0000000000
Binary files a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav and /dev/null differ
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index d3ec9da32d..d8db41e488 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -48,7 +48,6 @@ var UTF_CODE = 0;
 // Only plays a sound if it is downloaded.
 // Only plays one sound at a time.
 var emojiCreateSound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound1.wav'));
-var emojiDestroySound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound2.wav'));
 var injector;
 var DEFAULT_VOLUME = 0.01;
 var local = false;
@@ -79,7 +78,6 @@ function pruneOldAvimojis() {
         });
 }
 
-
 function maybeClearTimeoutDelete() {
     if (defaultTimeout) {
         Script.clearTimeout(defaultTimeout);
@@ -157,6 +155,7 @@ function handleSelectedEmoji(emojiFilename) {
     }
 }
 
+
 function onDomainChanged() {
     resetEmojis();
 }
@@ -167,6 +166,14 @@ function onScaleChanged() {
 }
 
 
+function onAddingWearable(id) {
+    var props = Entities.getEntityProperties(id, ["name"]);
+    if (props.name.toLowerCase().indexOf("avimoji") > -1) {
+        Entities.deleteEntity(id);
+    }
+}
+
+
 // #endregion
 // *************************************
 // END ui_handlers
@@ -179,7 +186,13 @@ function onScaleChanged() {
 
 
 // what happens when we need to add an emoji over a user
+var firstEmojiMadeOnStartup = false;
 function addEmoji(emojiFilename) {
+    if (!firstEmojiMadeOnStartup) {
+        firstEmojiMadeOnStartup = true;
+        Entities.addingWearable.disconnect(onAddingWearable);
+    }
+
     if (currentEmoji) {
         resetEmojis();
     }
@@ -312,9 +325,7 @@ function playPopAnimation() {
         if (popType === "in") {
             currentPopScale = MIN_POP_SCALE;
         } else {
-            // Start with the pop sound on the out
             currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE;
-            playSound(emojiDestroySound, DEFAULT_VOLUME, MyAvatar.position, true);
         }
     }
 
@@ -388,7 +399,8 @@ function playPopAnimation() {
 var emojiCodeMap;
 var customEmojiCodeMap;
 var signalsConnected = false;
-function init() {
+var _this;
+function startup() {
     // make a map of just the utf codes to help with accesing
     emojiCodeMap = emojiList.reduce(function (codeMap, currentEmojiInList, index) {
         if (
@@ -414,55 +426,31 @@ function init() {
 
     pruneOldAvimojis();
 
+    Script.scriptEnding.connect(unload);
     Window.domainChanged.connect(onDomainChanged);
     MyAvatar.scaleChanged.connect(onScaleChanged);
-    Script.scriptEnding.connect(scriptEnding);
+    Entities.addingWearable.connect(onAddingWearable);
     signalsConnected = true;
-}
 
-
-// #endregion
-// *************************************
-// END main
-// *************************************
-
-// *************************************
-// START cleanup
-// *************************************
-// #region cleanup
-
-
-function scriptEnding() {
-    resetEmojis();
-    if (signalsConnected) {
-        Script.scriptEnding.disconnect(scriptEnding);
-        Window.domainChanged.disconnect(onDomainChanged);
-        MyAvatar.scaleChanged.disconnect(onScaleChanged);
-        signalsConnected = false;
+    function AviMoji() {
+        _this = this;
+        this._avimojiQMLWindow = null;
     }
+
+    AviMoji.prototype = {
+        addEmoji: addEmojiFromQML,
+        registerAvimojiQMLWindow: registerAvimojiQMLWindow
+    };
+
+    return new AviMoji();
 }
 
 
-// #endregion
-// *************************************
-// END cleanup
-// *************************************
-
-// *************************************
-// START API
-// *************************************
-// #region API
-
-var _this;
-function AviMoji() {
-    _this = this;
-    this._avimojiQMLWindow;
-}
-
 function registerAvimojiQMLWindow(avimojiQMLWindow) {
     this._avimojiQMLWindow = avimojiQMLWindow;
 }
 
+
 function addEmojiFromQML(code) {
     var emojiObject = emojiList[emojiCodeMap[code]];
     var emojiFilename;
@@ -475,25 +463,21 @@ function addEmojiFromQML(code) {
     handleSelectedEmoji(emojiFilename);
 }
 
+
 function unload() {
-    scriptEnding();
+    resetEmojis();
+    if (signalsConnected) {
+        Window.domainChanged.disconnect(onDomainChanged);
+        MyAvatar.scaleChanged.disconnect(onScaleChanged);
+        if (!firstEmojiMadeOnStartup) {
+            Entities.addingWearable.disconnect(onAddingWearable);
+        }
+
+        signalsConnected = false;
+    }
 }
 
-function startup() {
-    init();
-}
 
-AviMoji.prototype = {
-    startup: startup,
-    addEmoji: addEmojiFromQML,
-    unload: unload,
-    registerAvimojiQMLWindow: registerAvimojiQMLWindow
-};
+var aviMoji = startup();
 
-
-module.exports = AviMoji;
-
-// #endregion
-// *************************************
-// END API
-// *************************************
\ No newline at end of file
+module.exports = aviMoji;
\ No newline at end of file
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
index dd78b8fe09..a890be46f1 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
@@ -66,6 +66,7 @@ Rectangle {
             .forEach(function(item, index){
                 item.code = { utf: item.code[0] }
                 item.keywords = { keywords: item.keywords }
+                item.shortName = item.shortName
                 mainModel.append(item);
                 filteredModel.append(item);
             });
@@ -73,6 +74,7 @@ Rectangle {
             .forEach(function(item, index){
                 item.code = { utf: item.name }
                 item.keywords = { keywords: item.keywords }
+                item.shortName = item.name
                 mainModel.append(item);
                 filteredModel.append(item);
             });
@@ -230,7 +232,7 @@ Rectangle {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        height: 200
+        height: 160
         clip: true
         color: simplifiedUI.colors.darkBackground
 
@@ -248,8 +250,8 @@ Rectangle {
 
         Image {
             id: mainEmojiImage
-            width: 180
-            height: 180
+            width: emojiIndicatorContainer.width - 20
+            height: emojiIndicatorContainer.height - 20
             anchors.centerIn: parent
             source: ""
             fillMode: Image.PreserveAspectFit
@@ -281,6 +283,64 @@ Rectangle {
     }
 
 
+    Item {
+        id: searchBarContainer
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: emojiIndicatorContainer.bottom
+        width: Math.min(parent.width, 420)
+        height: 48
+
+        SimplifiedControls.TextField {
+            id: emojiSearchTextField
+            readonly property string defaultPlaceholderText: "Search Emojis"
+            bottomBorderVisible: false
+            backgroundColor: "#313131"
+            placeholderText: emojiSearchTextField.defaultPlaceholderText
+            maximumLength: 100
+            clip: true
+            selectByMouse: true
+            autoScroll: true
+            horizontalAlignment: TextInput.AlignHCenter
+            anchors.left: parent.left
+            anchors.leftMargin: 16
+            anchors.right: parent.right
+            anchors.rightMargin: 16
+            anchors.verticalCenter: parent.verticalCenter
+            onTextChanged: {
+                if (text.length === 0) {
+                    root.filterEmoji(emojiSearchTextField.text);
+                } else {
+                    waitForMoreInputTimer.restart();
+                }
+            }
+            onAccepted: {
+                root.filterEmoji(emojiSearchTextField.text);
+                waitForMoreInputTimer.stop();
+                if (filteredModel.count === 1) {
+                    root.selectEmoji(filteredModel.get(0).code.utf);
+                } else {
+                    grid.forceActiveFocus();
+                }
+            }
+
+            KeyNavigation.backtab: grid
+            KeyNavigation.tab: grid
+        }
+
+        Timer {
+            id: waitForMoreInputTimer
+            repeat: false
+            running: false
+            triggeredOnStart: false
+            interval: 300
+
+            onTriggered: {
+                root.filterEmoji(emojiSearchTextField.text);
+            }
+        }
+    }
+
+
     function selectEmoji(code) {
         sendToScript({
             "source": "SimplifiedEmoji.qml",
@@ -294,13 +354,45 @@ Rectangle {
 
     Rectangle {
         id: emojiIconListContainer
-        anchors.top: emojiIndicatorContainer.bottom
+        anchors.top: searchBarContainer.bottom
+        anchors.topMargin: 10
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.bottom: bottomContainer.top
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 8
         clip: true
         color: simplifiedUI.colors.darkBackground
 
+        Item {
+            id: helpGlyphContainer
+            anchors.left: parent.left
+            anchors.leftMargin: 4
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 2
+            width: 22
+            height: width
+
+            HifiStylesUit.GraphikRegular {
+                text: "?"
+                anchors.fill: parent
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                color: simplifiedUI.colors.text.darkGrey
+                opacity: attributionMouseArea.containsMouse ? 1.0 : 0.8
+                size: 22
+            }
+        
+            MouseArea {
+                id: attributionMouseArea
+                hoverEnabled: enabled
+                anchors.fill: parent
+                propagateComposedEvents: false
+                onClicked: {
+                    popupContainer.visible = true;
+                }
+            }
+        }
+
         GridView {
             id: grid
             anchors.fill: parent
@@ -319,13 +411,18 @@ Rectangle {
                         anchors.fill: parent
                         propagateComposedEvents: false
                         onEntered: {
-                            grid.currentIndex = index
+                            grid.currentIndex = index;
                             // don't allow a hover image change of the main emoji image 
                             if (root.isSelected) {
                                 return;
                             }
                             // Updates the selected image
                             root.currentCode = model.code.utf;
+                            // Ensures that the placeholder text is visible and updated
+                            if (emojiSearchTextField.text === "") {
+                                grid.forceActiveFocus();
+                            }
+                            emojiSearchTextField.placeholderText = "::" + model.shortName + "::";
                         }
                         onClicked: {
                             root.selectEmoji(model.code.utf);
@@ -379,88 +476,6 @@ Rectangle {
         }
     }
 
-
-    Item {
-        id: bottomContainer
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        height: 40
-
-        SimplifiedControls.TextField {
-            id: emojiSearchTextField
-            placeholderText: "Search"
-            maximumLength: 100
-            clip: true
-            selectByMouse: true
-            autoScroll: true
-            anchors.left: parent.left
-            anchors.leftMargin: 16
-            anchors.right: helpGlyphContainer.left
-            anchors.rightMargin: 16
-            anchors.verticalCenter: parent.verticalCenter
-            onTextChanged: {
-                if (text.length === 0) {
-                    root.filterEmoji(emojiSearchTextField.text);
-                } else {
-                    waitForMoreInputTimer.restart();
-                }
-            }
-            onAccepted: {
-                root.filterEmoji(emojiSearchTextField.text);
-                waitForMoreInputTimer.stop();
-                if (filteredModel.count === 1) {
-                    root.selectEmoji(filteredModel.get(0).code.utf);
-                } else {
-                    grid.forceActiveFocus();
-                }
-            }
-
-            KeyNavigation.backtab: grid
-            KeyNavigation.tab: grid
-        }
-
-        Timer {
-            id: waitForMoreInputTimer
-            repeat: false
-            running: false
-            triggeredOnStart: false
-            interval: 300
-
-            onTriggered: {
-                root.filterEmoji(emojiSearchTextField.text);
-            }
-        }
-
-        Item {
-            id: helpGlyphContainer
-            anchors.right: parent.right
-            anchors.rightMargin: 8
-            width: height
-            height: parent.height
-
-            HifiStylesUit.GraphikRegular {
-                text: "?"
-                anchors.fill: parent
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                color: simplifiedUI.colors.text.darkGrey
-                opacity: attributionMouseArea.containsMouse ? 1.0 : 0.8
-                size: 22
-            }
-        
-            MouseArea {
-                id: attributionMouseArea
-                hoverEnabled: enabled
-                anchors.fill: parent
-                propagateComposedEvents: false
-                onClicked: {
-                    popupContainer.visible = true;
-                }
-            }
-        }
-    }
-
     function filterEmoji(filterText) {
         filteredModel.clear();
 
diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index d4044218fc..8633fe8870 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -16,11 +16,13 @@
 // *************************************
 // #region dependencies
 
+
 // The information needed to properly use the sprite sheets and get the general information
 // about the emojis
 var emojiList = Script.require("./emojiApp/resources/modules/emojiList.js");
 var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiList.js");
 
+
 // #endregion
 // *************************************
 // END dependencies
@@ -38,7 +40,6 @@ var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiLi
 // #region EMOTE_UTILITY
 
 
-
 function updateEmoteAppBarPosition() {
     if (!emoteAppBarWindow) {
         return;
@@ -150,7 +151,7 @@ function getClapPosition() {
     var validLeftJoints = ["LeftHandMiddle2", "LeftHand", "LeftArm"];
     var leftPosition = getValidJointPosition(validLeftJoints);
 
-    var validRightJoints = ["RightHandMiddle2", "RightHand", "RightArm"];;
+    var validRightJoints = ["RightHandMiddle2", "RightHand", "RightArm"];
     var rightPosition = getValidJointPosition(validRightJoints);
 
     var centerPosition = Vec3.sum(leftPosition, rightPosition);
@@ -182,6 +183,7 @@ function maybeClearClapSoundInterval() {
     }
 }
 
+
 // URLs for this fn are relative to SimplifiedEmoteIndicator.qml
 function toggleReaction(reaction) {
     var reactionEnding = reactionsBegun.indexOf(reaction) > -1;
@@ -193,10 +195,31 @@ function toggleReaction(reaction) {
     }
 }
 
+
+function maybeDeleteRemoteIndicatorTimeout() {
+    if (restoreEmoteIndicatorTimeout) {
+        Script.clearTimeout(restoreEmoteIndicatorTimeout);
+        restoreEmoteIndicatorTimeout = null;
+    }
+}
+
 var reactionsBegun = [];
 var pointReticle = null;
 var mouseMoveEventsConnected = false;
+var targetPointInterpolateConnected = false;
+var pointAtTarget = Vec3.ZERO;
+var isReticleVisible = true;
+
+function targetPointInterpolate() {
+    if (reticlePosition) {
+        pointAtTarget = Vec3.mix(pointAtTarget, reticlePosition, POINT_AT_MIX_ALPHA);
+        isReticleVisible = MyAvatar.setPointAt(pointAtTarget);
+    }
+}
+
 function beginReactionWrapper(reaction) {
+    maybeDeleteRemoteIndicatorTimeout();
+
     reactionsBegun.forEach(function(react) {
         endReactionWrapper(react);
     });
@@ -214,10 +237,15 @@ function beginReactionWrapper(reaction) {
             break;
         case ("point"):
             deleteOldReticles();
+            pointAtTarget = MyAvatar.getHeadLookAt();
             if (!mouseMoveEventsConnected) {
                 Controller.mouseMoveEvent.connect(mouseMoveEvent);
                 mouseMoveEventsConnected = true;
             }
+            if (!targetPointInterpolateConnected) {
+                Script.update.connect(targetPointInterpolate);
+                targetPointInterpolateConnected = true;
+            }
     }
 }
 
@@ -236,6 +264,8 @@ function deleteOldReticles() {
 var MAX_INTERSECTION_DISTANCE_M = 50;
 var reticleUpdateRateLimiterTimer = false;
 var RETICLE_UPDATE_RATE_LIMITER_TIMER_MS = 75;
+var POINT_AT_MIX_ALPHA = 0.15;
+var reticlePosition = Vec3.ZERO;
 function mouseMoveEvent(event) {
     if (!reticleUpdateRateLimiterTimer) {
         reticleUpdateRateLimiterTimer = Script.setTimeout(function() {
@@ -247,11 +277,10 @@ function mouseMoveEvent(event) {
 
 
     var pickRay = Camera.computePickRay(event.x, event.y);
-    var avatarIntersectionData = AvatarManager.findRayIntersection(pickRay);
+    var avatarIntersectionData = AvatarManager.findRayIntersection(pickRay, [], [MyAvatar.sessionUUID], false);
     var entityIntersectionData = Entities.findRayIntersection(pickRay, true);
     var avatarIntersectionDistanceM = avatarIntersectionData.intersects && avatarIntersectionData.distance < MAX_INTERSECTION_DISTANCE_M ? avatarIntersectionData.distance : null;
     var entityIntersectionDistanceM = entityIntersectionData.intersects && entityIntersectionData.distance < MAX_INTERSECTION_DISTANCE_M ? entityIntersectionData.distance : null;
-    var reticlePosition;
 
     if (avatarIntersectionDistanceM && entityIntersectionDistanceM) {
         if (avatarIntersectionDistanceM < entityIntersectionDistanceM) {
@@ -269,7 +298,7 @@ function mouseMoveEvent(event) {
     }
 
     if (pointReticle && reticlePosition) {
-        Entities.editEntity(pointReticle, { position: reticlePosition });
+        Entities.editEntity(pointReticle, { position: reticlePosition, visible: isReticleVisible });
     } else if (reticlePosition) {
         pointReticle = Entities.addEntity({
             type: "Box",
@@ -287,15 +316,25 @@ function mouseMoveEvent(event) {
 }
 
 
+var WAIT_TO_RESTORE_EMOTE_INDICATOR_ICON_MS = 2000;
+var restoreEmoteIndicatorTimeout;
 function triggerReactionWrapper(reaction) {
+    maybeDeleteRemoteIndicatorTimeout();
+
     reactionsBegun.forEach(function(react) {
         endReactionWrapper(react);
     });
 
     MyAvatar.triggerReaction(reaction);
     updateEmoteIndicatorIcon("images/" + reaction + "_Icon.svg");
+
+    restoreEmoteIndicatorTimeout = Script.setTimeout(function() {
+        updateEmoteIndicatorIcon("images/emote_Icon.svg");
+        restoreEmoteIndicatorTimeout = null;
+    }, WAIT_TO_RESTORE_EMOTE_INDICATOR_ICON_MS);
 }
 
+
 function maybeClearReticleUpdateLimiterTimeout() {
     if (reticleUpdateRateLimiterTimer) {
         Script.clearTimeout(reticleUpdateRateLimiterTimer);
@@ -325,8 +364,11 @@ function endReactionWrapper(reaction) {
                 Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
                 mouseMoveEventsConnected = false;
             }
+            if (targetPointInterpolateConnected) {
+                Script.update.disconnect(targetPointInterpolate);
+                targetPointInterpolateConnected = false;
+            }
             maybeClearReticleUpdateLimiterTimeout();
-            intersectedEntityOrAvatarID = null;
             deleteOldReticles();
             break;
     }
@@ -377,6 +419,7 @@ function onMessageFromEmoteAppBar(message) {
     }
 }
 
+
 function getEmojiURLFromCode(code) {
     var emojiObject = emojiList[emojiCodeMap[code]];
     var emojiFilename;
@@ -389,6 +432,7 @@ function getEmojiURLFromCode(code) {
     return "../../emojiApp/resources/images/emojis/52px/" + emojiFilename;
 }
 
+
 function updateEmoteIndicatorIcon(iconURL) {
     emoteAppBarWindow.sendToQml({
         "source": "simplifiedEmote.js",
@@ -408,7 +452,7 @@ function onGeometryChanged(rect) {
 function onWindowMinimizedChanged(isMinimized) {
     if (isMinimized) {
         handleEmoteIndicatorVisibleChanged(false);
-    } else if (!HMD.active && Settings.getValue("simplifiedUI/emoteIndicatorVisible", true)) {
+    } else if (!HMD.active) {
         handleEmoteIndicatorVisibleChanged(true);
     }
 }
@@ -435,7 +479,10 @@ function keyPressHandler(event) {
         } else if (event.text === RAISE_HAND_KEY) {
             toggleReaction("raiseHand");
         } else if (event.text === APPLAUD_KEY) {
-            toggleReaction("applaud");
+            // Make sure this doesn't get triggered if you are flying, falling, or jumping
+            if (!MyAvatar.isInAir()) {
+                toggleReaction("applaud");
+            }
         } else if (event.text === POINT_KEY) {
             toggleReaction("point");
         } else if (event.text === EMOTE_WINDOW && !(Settings.getValue("io.highfidelity.isEditing", false))) {
@@ -503,8 +550,8 @@ function showEmoteAppBar() {
 }
 
 
-function handleEmoteIndicatorVisibleChanged(newValue) {
-    if (newValue && !emoteAppBarWindow) {
+function handleEmoteIndicatorVisibleChanged(shouldBeVisible) {
+    if (shouldBeVisible && !emoteAppBarWindow) {
         showEmoteAppBar();
     } else if (emoteAppBarWindow) {
         emoteAppBarWindow.fromQml.disconnect(onMessageFromEmoteAppBar);
@@ -514,13 +561,6 @@ function handleEmoteIndicatorVisibleChanged(newValue) {
 }
 
 
-function onSettingsValueChanged(settingName, newValue) {
-    if (settingName === "simplifiedUI/emoteIndicatorVisible") {
-        handleEmoteIndicatorVisibleChanged(newValue);
-    }
-}
-
-
 function onDisplayModeChanged(isHMDMode) {
     reactionsBegun.forEach(function(react) {
         endReactionWrapper(react);
@@ -528,17 +568,17 @@ function onDisplayModeChanged(isHMDMode) {
 
     if (isHMDMode) {
         handleEmoteIndicatorVisibleChanged(false);
-    } else if (Settings.getValue("simplifiedUI/emoteIndicatorVisible", true)) {
+    } else {
         handleEmoteIndicatorVisibleChanged(true);
     }
 }
 
 
-var EmojiAPI = Script.require("./emojiApp/simplifiedEmoji.js");
-var emojiAPI = new EmojiAPI();
+var emojiAPI = Script.require("./emojiApp/simplifiedEmoji.js?" + Date.now());
 var keyPressSignalsConnected = false;
 var emojiCodeMap;
-function init() {
+var customEmojiCodeMap;
+function setup() {
     deleteOldReticles();
 
     // make a map of just the utf codes to help with accesing
@@ -566,22 +606,19 @@ function init() {
 
     Window.minimizedChanged.connect(onWindowMinimizedChanged);
     Window.geometryChanged.connect(onGeometryChanged);
-    Settings.valueChanged.connect(onSettingsValueChanged);
     HMD.displayModeChanged.connect(onDisplayModeChanged);
-    emojiAPI.startup();
 
     getSounds();
-    handleEmoteIndicatorVisibleChanged(Settings.getValue("simplifiedUI/emoteIndicatorVisible", true));
+    handleEmoteIndicatorVisibleChanged(true);
     
     Controller.keyPressEvent.connect(keyPressHandler);
     Controller.keyReleaseEvent.connect(keyReleaseHandler);
     keyPressSignalsConnected = true;
-
-    Script.scriptEnding.connect(shutdown);
+    Script.scriptEnding.connect(unload);
 }
 
 
-function shutdown() {
+function unload() {
     if (emoteAppBarWindow) {
         emoteAppBarWindow.fromQml.disconnect(onMessageFromEmoteAppBar);
         emoteAppBarWindow.close();
@@ -596,13 +633,12 @@ function shutdown() {
         endReactionWrapper(react);
     });
 
-    emojiAPI.unload();
     maybeClearClapSoundInterval();
     maybeClearReticleUpdateLimiterTimeout();
+    maybeDeleteRemoteIndicatorTimeout();
 
     Window.minimizedChanged.disconnect(onWindowMinimizedChanged);
     Window.geometryChanged.disconnect(onGeometryChanged);
-    Settings.valueChanged.disconnect(onSettingsValueChanged);
     HMD.displayModeChanged.disconnect(onDisplayModeChanged);
 
     if (keyPressSignalsConnected) {
@@ -634,6 +670,7 @@ function shutdown() {
 // *************************************
 // #region EMOJI_UTILITY
 
+
 var EMOJI_52_BASE_URL = "../../resources/images/emojis/52px/";
 function selectedEmoji(code) {
     emojiAPI.addEmoji(code);
@@ -749,37 +786,4 @@ function toggleEmojiApp() {
 // END EMOJI
 // *************************************
 
-// *************************************
-// START API
-// *************************************
-// #region API
-
-
-function startup() {
-    init();
-}
-
-
-function unload() {
-    shutdown();
-}
-
-var _this;
-function EmoteBar() {
-    _this = this;
-}
-
-
-EmoteBar.prototype = {
-    startup: startup,
-    unload: unload
-};
-
-module.exports = EmoteBar;
-
-
-// #endregion
-// *************************************
-// END API
-// *************************************
-
+setup();
\ No newline at end of file
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
index 9aa7571494..bbd1d4d735 100644
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
@@ -21,30 +21,45 @@ Rectangle {
     id: root
     color: simplifiedUI.colors.white
     anchors.fill: parent
-
     property int originalWidth: 48
     property int expandedWidth: mainEmojiContainer.width + drawerContainer.width
     // For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea`
-    property int requestedWidth: (drawerContainer.keepDrawerExpanded ||
-        emoteIndicatorMouseArea.containsMouse ||
-        emoteButtonsRepeater.itemAt(0).hovered ||
-        emoteButtonsRepeater.itemAt(1).hovered ||
-        emoteButtonsRepeater.itemAt(2).hovered ||
-        emoteButtonsRepeater.itemAt(3).hovered ||
-        emoteButtonsRepeater.itemAt(4).hovered ||
-        emoteButtonsRepeater.itemAt(5).hovered) ? expandedWidth : originalWidth;
+    property int requestedWidth: (
+        root.allowEmoteDrawerExpansion && (
+            drawerContainer.keepDrawerExpanded ||
+            emoteIndicatorMouseArea.containsMouse ||
+            emoteButtonsRepeater.itemAt(0).hovered ||
+            emoteButtonsRepeater.itemAt(1).hovered ||
+            emoteButtonsRepeater.itemAt(2).hovered ||
+            emoteButtonsRepeater.itemAt(3).hovered ||
+            emoteButtonsRepeater.itemAt(4).hovered ||
+            emoteButtonsRepeater.itemAt(5).hovered)
+        ) ? expandedWidth : originalWidth;
     readonly property int totalEmojiDurationMS: 7000 // Must match `TOTAL_EMOJI_DURATION_MS` in `simplifiedEmoji.js`
     readonly property string emoteIconSource: "images/emote_Icon.svg"
+    property bool allowEmoteDrawerExpansion: Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true)
+
 
     onRequestedWidthChanged: {
         root.requestNewWidth(root.requestedWidth);
     }
 
     Behavior on requestedWidth {
-        enabled: true
+        enabled: false // Set this to `true` once we have a different windowing system that better supports on-screen widgets
+                       // like the Emote Indicator.
         SmoothedAnimation { duration: 220 }
     }
 
+    Connections {
+        target: Settings
+
+        onValueChanged: {
+            if (setting === "simplifiedUI/allowEmoteDrawerExpansion") {
+                root.allowEmoteDrawerExpansion = value;
+            }
+        }
+    }
+
     SimplifiedConstants.SimplifiedConstants {
         id: simplifiedUI
     }
@@ -139,6 +154,28 @@ Rectangle {
             opacity: emoteIndicator.source.toString().indexOf("Icon.svg") > -1 ? 1.0 : 0.0
         }
 
+        Image {
+            id: lockIcon
+            width: 12
+            height: 12
+            anchors.top: parent.top
+            anchors.topMargin: 2
+            anchors.left: parent.left
+            anchors.leftMargin: 0
+            source: "images/lock_Icon.svg"
+            fillMode: Image.PreserveAspectFit
+            mipmap: true
+            visible: false
+        }
+
+        ColorOverlay {
+            id: lockIconColorOverlay
+            anchors.fill: lockIcon
+            source: lockIcon
+            color: "#ffffff"
+            visible: root.allowEmoteDrawerExpansion && drawerContainer.keepDrawerExpanded
+        }
+
         MouseArea {
             id: emoteIndicatorMouseArea
             anchors.fill: parent
@@ -147,14 +184,21 @@ Rectangle {
             onClicked: {
                 Tablet.playSound(TabletEnums.ButtonClick);
                 drawerContainer.keepDrawerExpanded = !drawerContainer.keepDrawerExpanded;
+                // If the drawer is no longer expanded, disable this MouseArea (which will close
+                // the emote tray) until the user's cursor leaves the MouseArea (see `onExited()` below).
+                if (!drawerContainer.keepDrawerExpanded) {
+                    emoteIndicatorMouseArea.enabled = false;
+                }
             }
 
             onEntered: {
                 Tablet.playSound(TabletEnums.ButtonHover);
             }
-        }
 
-        
+            onExited: {
+                emoteIndicatorMouseArea.enabled = true;
+            }
+        }
     }
 
     Row {
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/lock_Icon.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/lock_Icon.svg
new file mode 100644
index 0000000000..2195fa728f
--- /dev/null
+++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/lock_Icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 42 64" style="enable-background:new 0 0 42 64;" xml:space="preserve">
+<path d="M36.8,22.8v-7.1C36.8,7,29.7,0,21,0S5.2,7,5.2,15.7v7.1C2.2,23.8,0,26.7,0,30v26.3C0,60.5,3.5,64,7.8,64h26.5
+	c4.3,0,7.8-3.5,7.8-7.7V30C42,26.7,39.8,23.8,36.8,22.8z M27.1,50.5c0,3.3-2.8,6.1-6.1,6.1s-6.1-2.7-6.1-6.1v-2.3
+	c0-3.3,2.8-6.1,6.1-6.1s6.1,2.7,6.1,6.1V50.5z M30,22.4H12v-6.7c0-4.9,4-8.9,9-8.9s9,4,9,8.9V22.4z"/>
+</svg>
diff --git a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
index beea979170..15ce8a83f6 100644
--- a/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
+++ b/scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
@@ -47,15 +47,24 @@ function onAvatarAdded(uuid) {
 }
 
 
-// Called on init
+// Create a new nametag list manager, connect signals, and return back a new Nametag object.
 var avatarNametagMode;
 function startup() {
     nameTagListManager.create();
     handleAvatarNametagMode(Settings.getValue("simplifiedNametag/avatarNametagMode", "on"));
 
+    Script.scriptEnding.connect(unload);
     Window.domainChanged.connect(onDomainChange);
     AvatarManager.avatarRemovedEvent.connect(onAvatarRemoved);
     AvatarManager.avatarAddedEvent.connect(onAvatarAdded);
+
+    function NameTag() {}
+    
+    NameTag.prototype = {
+        handleAvatarNametagMode: handleAvatarNametagMode
+    };
+
+    return new NameTag();
 }
 
 
@@ -77,23 +86,7 @@ function handleAvatarNametagMode(newAvatarNameTagMode) {
 }
 
 
-// *************************************
-// START api
-// *************************************
-// #region api
+var nameTag = startup();
 
-function NameTag() {}
+module.exports = nameTag;
 
-NameTag.prototype = {
-    startup: startup,
-    unload: unload,
-    handleAvatarNametagMode: handleAvatarNametagMode
-};
-
-module.exports = NameTag;
-
-
-// #endregion
-// *************************************
-// END api
-// *************************************
\ No newline at end of file
diff --git a/scripts/simplifiedUI/ui/simplifiedStatusIndicator/simplifiedStatusIndicator.js b/scripts/simplifiedUI/ui/simplifiedStatusIndicator/simplifiedStatusIndicator.js
index c064e2d138..4d06ecc99b 100644
--- a/scripts/simplifiedUI/ui/simplifiedStatusIndicator/simplifiedStatusIndicator.js
+++ b/scripts/simplifiedUI/ui/simplifiedStatusIndicator/simplifiedStatusIndicator.js
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
 
-function simplifiedStatusIndicator(properties) {
+function SimplifiedStatusIndicator() {
     var that = this;
     var DEBUG = false;
 
@@ -64,7 +64,9 @@ function simplifiedStatusIndicator(properties) {
         
         queryParamString += "&displayName=" + displayNameToSend;
         queryParamString += "&status=" + currentStatus;
-        queryParamString += "&organization=" + location.hostname;
+        var domainID = location.domainID;
+        domainID = domainID.substring(1, domainID.length - 1);
+        queryParamString += "&organization=" + domainID;
 
         var uri = REQUEST_URL + "?" + queryParamString;
 
@@ -84,6 +86,7 @@ function simplifiedStatusIndicator(properties) {
         });
     }
 
+
     // Get status from database
     function getStatus(callback) {
         var queryParamString = "type=getStatus";
@@ -123,6 +126,17 @@ function simplifiedStatusIndicator(properties) {
 
     // #region SIGNALS
 
+    function updateProperties(properties) {
+        // Overwrite with the given properties
+        var overwriteableKeys = ["statusChanged"];
+        Object.keys(properties).forEach(function (key) {
+            if (overwriteableKeys.indexOf(key) > -1) {
+                that[key] = properties[key];
+            }
+        });
+    }
+
+    
     var currentStatus = "available"; // Default is available
     function toggleStatus() {
         if (currentStatus === "busy") {
@@ -205,6 +219,8 @@ function simplifiedStatusIndicator(properties) {
         Window.domainChanged.connect(onDomainChanged);
 
         getStatus(setStatus);
+
+        Script.scriptEnding.connect(unload);
     }
 
 
@@ -222,20 +238,15 @@ function simplifiedStatusIndicator(properties) {
 
     // #endregion APP LIFETIME
 
-    that.startup = startup;
-    that.unload = unload;
     that.toggleStatus = toggleStatus;
     that.setStatus = setStatus;
     that.getLocalStatus = getLocalStatus;
     that.statusChanged = statusChanged;
-    
-    // Overwrite with the given properties
-    var overwriteableKeys = ["statusChanged"];
-    Object.keys(properties).forEach(function (key) {
-        if (overwriteableKeys.indexOf(key) > -1) {
-            that[key] = properties[key];
-        }
-    });
+    that.updateProperties = updateProperties;
+
+    startup();
 }
 
+var simplifiedStatusIndicator = new SimplifiedStatusIndicator();
+
 module.exports = simplifiedStatusIndicator;
\ No newline at end of file
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 803c6627c0..1154e386ea 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -296,7 +296,7 @@ function updateOutputDeviceMutedOverlay(isMuted) {
         props.y = Window.innerHeight / 2 - overlayDims / 2;
 
         var outputDeviceMutedOverlayBottomY = props.y + overlayDims;
-        var inputDeviceMutedOverlayTopY = getInputDeviceMutedOverlayTopY();
+        var inputDeviceMutedOverlayTopY = INPUT_DEVICE_MUTED_MARGIN_TOP_PX;
         if (outputDeviceMutedOverlayBottomY + OUTPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX > inputDeviceMutedOverlayTopY) {
             overlayDims = 2 * (inputDeviceMutedOverlayTopY - Window.innerHeight / 2 - OUTPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX);
         }
@@ -473,15 +473,11 @@ function maybeDeleteInputDeviceMutedOverlay() {
 }
 
 
-function getInputDeviceMutedOverlayTopY() {
-    return (Window.innerHeight - INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_Y_PX - INPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX);
-}
-
-
 var inputDeviceMutedOverlay = false;
-var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_X_PX = 353;
-var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_Y_PX = 95;
-var INPUT_DEVICE_MUTED_MARGIN_BOTTOM_PX = 20 + TOP_BAR_HEIGHT_PX;
+var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_X_PX = 237;
+var INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_Y_PX = 64;
+var INPUT_DEVICE_MUTED_MARGIN_LEFT_PX = 20;
+var INPUT_DEVICE_MUTED_MARGIN_TOP_PX = 20;
 function updateInputDeviceMutedOverlay(isMuted) {
     if (isMuted) {
         var props = {
@@ -490,8 +486,8 @@ function updateInputDeviceMutedOverlay(isMuted) {
         };
         props.width = INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_X_PX;
         props.height = INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_Y_PX;
-        props.x = Window.innerWidth / 2 - INPUT_DEVICE_MUTED_OVERLAY_DEFAULT_X_PX / 2;
-        props.y = getInputDeviceMutedOverlayTopY();
+        props.x = INPUT_DEVICE_MUTED_MARGIN_LEFT_PX;
+        props.y = INPUT_DEVICE_MUTED_MARGIN_TOP_PX;
         if (inputDeviceMutedOverlay) {
             Overlays.editOverlay(inputDeviceMutedOverlay, props);
         } else {
@@ -532,6 +528,11 @@ function onGeometryChanged(rect) {
     }
 }
 
+function onWindowMinimizedChanged() {
+    // prerequisite placeholder for Reduce Friction of Customer Acquisition sub task: https://highfidelity.atlassian.net/browse/DEV-585
+    print("WINDOW MINIMIZED CHANGED SIGNAL");
+}
+
 function onDisplayModeChanged(isHMDMode) {
     if (isHMDMode) {
         Camera.setModeString("first person");
@@ -583,12 +584,9 @@ function restoreLODSettings() {
 }
 
 
-var SimplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
-var SimplifiedStatusIndicator = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
-var SimplifiedEmote = Script.require("../simplifiedEmote/simplifiedEmote.js?" + Date.now());
-var si;
-var nametag;
-var emote;
+var nametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
+var si = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
+var emote = Script.require("../simplifiedEmote/simplifiedEmote.js?" + Date.now());
 var oldShowAudioTools;
 var oldShowBubbleTools;
 var keepExistingUIAndScriptsSetting = Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false);
@@ -607,22 +605,15 @@ function startup() {
 
     loadSimplifiedTopBar();
 
-    si = new SimplifiedStatusIndicator({
-        statusChanged: onStatusChanged
-    });
-    si.startup();
     
-    nametag = new SimplifiedNametag();
-    nametag.startup();
-
-    emote = new SimplifiedEmote();
-    emote.startup();
+    si.updateProperties({ statusChanged: onStatusChanged });
 
     updateInputDeviceMutedOverlay(Audio.muted);
     updateOutputDeviceMutedOverlay(isOutputMuted());
     Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged);
     Audio.mutedHMDChanged.connect(onHMDInputDeviceMutedChanged);
     Window.geometryChanged.connect(onGeometryChanged);
+    Window.minimizedChanged.connect(onWindowMinimizedChanged);
     HMD.displayModeChanged.connect(onDisplayModeChanged);
     Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
@@ -665,13 +656,10 @@ function shutdown() {
     maybeDeleteInputDeviceMutedOverlay();
     maybeDeleteOutputDeviceMutedOverlay();
 
-    nametag.unload();
-    si.unload();
-    emote.unload();
-
     Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged);
     Audio.mutedHMDChanged.disconnect(onHMDInputDeviceMutedChanged);
     Window.geometryChanged.disconnect(onGeometryChanged);
+    Window.minimizedChanged.disconnect(onWindowMinimizedChanged);
     HMD.displayModeChanged.disconnect(onDisplayModeChanged);
     Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
     Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 946de6df0f..a37fb13bd9 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -65,6 +65,7 @@ function onMessage(message) {
     // 2. Although we currently use a single image, we would like to take snapshot, a selfie, a 360 etc. all at the
     //    same time, show the user all of them, and have the user deselect any that they do not want to share.
     //    So we'll ultimately be receiving a set of objects, perhaps with different post processing for each.
+
     if (message.type !== "snapshot") {
         return;
     }
@@ -85,7 +86,7 @@ function onMessage(message) {
                         image_data: imageData,
                         canShare: canShare
                     });
-                });                
+                });
             } else {
                 ui.sendMessage({
                     type: "snapshot",
@@ -274,6 +275,14 @@ var POLAROID_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/alan/dev/Test/sna
 var POLAROID_RATE_LIMIT_MS = 1000;
 var polaroidPrintingIsRateLimited = false;
 
+// force call the gotoPreviousApp on script thead to load snapshot html page.
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+tablet.fromQml.connect(function(message) {
+    if (message === 'returnToPreviousApp') {
+	tablet.returnToPreviousApp();
+    }
+});
+
 function printToPolaroid(image_url) {
     // Rate-limit printing
     if (polaroidPrintingIsRateLimited) {
diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp
index 6b781a5bea..24805a3348 100644
--- a/tools/ac-client/src/ACClientApp.cpp
+++ b/tools/ac-client/src/ACClientApp.cpp
@@ -100,7 +100,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
 
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
-    DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
+    DependencyManager::set<AccountManager>(false, [&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
     DependencyManager::set<AddressManager>();
     DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
 
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
index 8c2fd44adf..b2e7db5c87 100644
--- a/tools/atp-client/src/ATPClientApp.cpp
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -138,7 +138,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
     DependencyManager::set<StatTracker>();
-    DependencyManager::set<AccountManager>([&]{ return QString(HIGH_FIDELITY_ATP_CLIENT_USER_AGENT); });
+    DependencyManager::set<AccountManager>(false, [&]{ return QString(HIGH_FIDELITY_ATP_CLIENT_USER_AGENT); });
     DependencyManager::set<AddressManager>();
     DependencyManager::set<NodeList>(NodeType::Agent, _listenPort);
 
diff --git a/tools/ci-scripts/notarize b/tools/ci-scripts/notarize
new file mode 100755
index 0000000000..aa4e84dda8
--- /dev/null
+++ b/tools/ci-scripts/notarize
@@ -0,0 +1,222 @@
+#!/bin/bash
+set -e
+
+# Sign, Notarize, and Staple a notarization ticket to the app.
+
+function usage {
+    echo "usage: $0 datt bundle_path [entitlements]"
+    exit -1
+}
+
+apple_id=""
+developer_id_key_label="Mac Developer ID Application: High Fidelity Inc"
+k_password_label="com.highfidelity.mac-signing-appleid"
+k_password_service="AC_PASSWORD"
+
+# Check for supported Mac OS Version (10.14 or greater)
+if [ ! -x /usr/bin/sw_vers ]; then
+    echo "Can't find sw_vers, is this Mac OS?"
+    exit -1
+fi
+set +e
+/usr/bin/sw_vers -productVersion | \
+    awk -F'.' '{ if ($1 == 10 && $2 >= 14) { exit 0 } else { exit 1 } }'
+is_supported=$?
+set -e
+if [[ $is_supported -eq 1 ]]; then
+    echo "Must use Mac OS 10.14 or greater"
+    exit -1
+fi
+
+# Check for Xcode
+if [ ! -x /usr/bin/xcode-select ]; then
+    echo "Xcode is not installed"
+    exit -1
+fi
+
+function set_apple_id {
+    if [[ "$apple_id" != "" ]]; then return; fi # already set
+
+    apple_id=$(security find-generic-password \
+        -l $k_password_label -s $k_password_service | \
+        grep acct | awk -F'=' '{ print $2 }' | tr -d '"')
+    if [ "$apple_id" == "" ]; then
+        echo "couldn't find Apple ID in keychain"
+        exit -1
+    fi
+}
+
+function ensure_developer_id_key_is_present {
+    set +e
+    security find-key -l "$developer_id_key_label" > /dev/null 2>&1
+    success=$?
+    set -e
+    if [[ $success == 1 ]]; then
+        echo "The Developer ID Key is not in your Keychain: $developer_id_key_label"
+        exit -1
+    fi
+}
+
+function sign {
+    bundle_path="$1"
+    entitlements="$2"
+
+    ensure_developer_id_key_is_present
+    if [ "$entitlements" != "" ]; then
+        codesign --force \
+            --deep \
+            --sign "Developer ID Application: High Fidelity Inc" \
+            --timestamp \
+            --options runtime \
+            --entitlements "$entitlements" \
+            "$bundle_path"
+    else
+        codesign --force \
+            --deep \
+            --sign "Developer ID Application: High Fidelity Inc" \
+            --timestamp \
+            --options runtime \
+            "$bundle_path"
+    fi
+}
+
+# The `notarize` function sets `result_uuid` on return.
+result_uuid=""
+
+function notarize {
+    local bundle_path=$1
+
+    local bundle_id=$(/usr/libexec/PlistBuddy -c Print:CFBundleIdentifier \
+                    "$bundle_path"/Contents/Info.plist)
+    if [ "$bundle_id" == "" ]; then
+        echo "couldn't find bundle id in bundle's Info.plist: $bundle_path"
+        exit -1
+    fi
+
+    set_apple_id
+
+    if [ -e "$bundle_path.zip" ]; then
+        echo "zip already exists, moving it out of the way"
+        mv "$bundle_path.zip"{,.$(uuidgen)}
+    fi
+
+    local local_bundle_path=$(basename "$bundle_path")
+    (cd "$bundle_path/.."; \
+     zip -r --symlinks "$local_bundle_path.zip" "$local_bundle_path" \
+        >/dev/null 2>&1)
+
+    # `result_uuid` is intentionally global
+    result_uuid=$(xcrun altool --notarize-app \
+        --primary-bundle-id $bundle_id \
+        --username $apple_id --password "@keychain:$k_password_service" \
+        --file "$bundle_path.zip" 2>&1 | tee /dev/tty | \
+        awk -F'=' '{ if (/^RequestUUID/) print $2 }' | sed 's/^ //')
+}
+
+function is_notarization_complete {
+    set_apple_id
+
+    set +e
+    local status_code=$(xcrun altool --notarization-info $result_uuid \
+        --username $apple_id --password "@keychain:$k_password_service" 2>&1 | \
+        awk '{ if (/Status Code/) print $3 }')
+    set -e
+    # Status Code is only set when a job is complete.
+    if [[ "$status_code" -ne "" ]]; then
+        return 1
+    fi
+    return $status_code
+}
+
+command=$1
+
+case $command in
+    # Utility to add your Apple ID to the keychain
+    add_password)
+        echo -n "Apple ID: "
+        read appleid_name
+        if [ "$appleid_name" == "" ]; then
+            echo "Apple ID was empty!"
+            exit -1
+        fi
+        security add-generic-password \
+            -a "$appleid_name" \
+            -s "$k_password_service" \
+            -l "$k_password_label" \
+            -j "Apple ID used for High Fidelity's code signing" \
+            -w
+        ;;
+
+    # Sign a bundle with the Developer ID Application cert
+    sign)
+        bundle_path=$2
+        if [ "$bundle_path" == "" ]; then
+            echo "usage: $0 $command bundle_path"
+            exit -1
+        fi
+        if [ ! -d "$bundle_path" ]; then
+            echo "bundle_path doesn't exist"
+            exit -1
+        fi
+
+        sign "$bundle_path" "$3"
+        ;;
+
+    # Submit a bundle to Apple for notarization
+    notarize)
+        bundle_path=$2
+        if [ "$bundle_path" == "" ]; then
+            echo "usage: $0 $command bundle_path"
+            exit -1
+        fi
+        if [ ! -d "$bundle_path" ]; then
+            echo "bundle_path doesn't exist"
+            exit -1
+        fi
+
+        notarize "$bundle_path"
+        ;;
+
+    # Check the notarization logs
+    logs)
+        result_uuid=$2
+        if [ "$result_uuid" == "" ]; then
+            echo "usage: $0 $command result_uuid"
+            exit -1
+        fi
+        set_apple_id
+
+        xcrun altool --notarization-info $result_uuid \
+            --username $apple_id --password "@keychain:$k_password_service"
+        ;;
+
+    # Do all the things.
+    datt)
+        bundle_path=$2
+        if [ "$bundle_path" == "" ]; then
+            echo "usage: $0 bundle_path [entitlements]"
+            exit -1
+        fi
+        if [ ! -d "$bundle_path" ]; then
+            echo "bundle_path doesn't exist"
+            exit -1
+        fi
+
+        sign "$bundle_path" "$3"
+        notarize "$bundle_path"
+
+        # TODO: is_notarization_complete needs to recognize notarization
+        # while :; do
+        #     echo "sleeping..."
+        #     sleep 27
+        #     is_notarization_complete
+        #     [[ $? == 1 ]] && break
+        # done
+        # xcrun stapler staple "$bundle_path"
+        ;;
+
+    *)
+        usage
+        ;;
+
+esac
diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp
index ff0d7630e5..31e154d38c 100644
--- a/tools/gpu-frame-player/src/RenderThread.cpp
+++ b/tools/gpu-frame-player/src/RenderThread.cpp
@@ -51,6 +51,12 @@ void RenderThread::initialize(QWindow* window) {
     _backend = _gpuContext->getBackend();
     _context.doneCurrent();
     _context.moveToThread(_thread);
+    
+    if (!_presentPipeline) {
+        gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::DrawTexture);
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        _presentPipeline = gpu::Pipeline::create(program, state);
+    }
 #else
     auto size = window->size();
     _extent = vk::Extent2D{ (uint32_t)size.width(), (uint32_t)size.height() };
@@ -169,15 +175,28 @@ void RenderThread::renderFrame(gpu::FramePointer& frame) {
     }
 
 #ifdef USE_GL
+    static gpu::BatchPointer batch = nullptr;
+    if (!batch) {
+        batch = std::make_shared<gpu::Batch>();
+        batch->setPipeline(_presentPipeline);
+        batch->setFramebuffer(nullptr);
+        batch->setResourceTexture(0, frame->framebuffer->getRenderBuffer(0));
+        batch->setViewportTransform(ivec4(uvec2(0), ivec2(windowSize.width(), windowSize.height())));
+        batch->draw(gpu::TRIANGLE_STRIP, 4);
+    }
+    glDisable(GL_FRAMEBUFFER_SRGB);
+    _gpuContext->executeBatch(*batch);
+    
+    // Keep this raw gl code here for reference
     //glDisable(GL_FRAMEBUFFER_SRGB);
     //glClear(GL_COLOR_BUFFER_BIT);
-    glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
+  /*  glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
     glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
     glBlitFramebuffer(
         0, 0, fboSize.x, fboSize.y, 
         0, 0, windowSize.width(), windowSize.height(),
         GL_COLOR_BUFFER_BIT, GL_NEAREST);
-
+*/
     (void)CHECK_GL_ERROR();
     _context.swapBuffers();
     _context.doneCurrent();
diff --git a/tools/gpu-frame-player/src/RenderThread.h b/tools/gpu-frame-player/src/RenderThread.h
index 09eef56623..b090e1737f 100644
--- a/tools/gpu-frame-player/src/RenderThread.h
+++ b/tools/gpu-frame-player/src/RenderThread.h
@@ -57,7 +57,7 @@ public:
     uint32_t _externalTexture{ 0 };
     void move(const glm::vec3& v);
     glm::mat4 _correction;
-
+    gpu::PipelinePointer _presentPipeline;
 
     void resize(const QSize& newSize);
     void setup() override;
diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
index a33cff15e4..2386f88586 100644
--- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
+++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
@@ -23,7 +23,7 @@
 ********************************************************************/
 
 * {
-  box-sizing: border-box
+  box-sizing: border-box;
 }
 
 html
@@ -38,11 +38,12 @@ body
 	font-weight: 400; 
     color: #000000;
     letter-spacing: 0.5px;  
+    font-size: 0.95rem;
+    line-height: 20px;    
 }
 
 p {
     font-size: 0.95rem;
-    line-height: 20px;
 }
 
 section
@@ -128,7 +129,6 @@ table {
 thead {
     border-color: #d8e1d9;
     background:#d8e1d9;
-    text-align: left;    
 }
 
 table tr {
@@ -146,6 +146,7 @@ td {
 article table thead tr th, article table tbody tr td, article table tbody tr td p {
     font-size: .89rem;
     line-height: 20px;
+    text-align: left;
 }
 
 article table thead tr th, article table tbody tr td {
@@ -199,6 +200,7 @@ nav {
     padding-left: 20px;
     padding-right: 20px;
     box-sizing: border-box;
+    line-height: 12px;
 }
 
 nav::-webkit-scrollbar {
@@ -378,12 +380,12 @@ nav > h2 > a {
 
 tt, code, kbd, samp {
     font-family: Consolas, Monaco, 'Andale Mono', monospace;
-    font-size: 0.9rem;
+    font-size: 1.05em;
 }
 
 .name, .signature {
   font-family: Consolas, Monaco, 'Andale Mono', monospace;
-  font-size: 0.9rem;
+  font-size: 1.05em;
 }
 
 img {
@@ -422,7 +424,6 @@ header {
     display: block;
     text-align: center;
     font-size: 90%;
-    margin-top: -20px;
 }
 
 .variation {
@@ -537,7 +538,7 @@ header {
 
 .prettyprint code
 {
-    font-size: 0.7rem;
+    font-size: 0.9em;
     line-height: 18px;
     display: block;
     padding: 4px 12px;
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
index 451ed4d01a..5c149fa434 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/container.tmpl
@@ -92,29 +92,33 @@
                         </tr>
                     </tbody>
                 </table>
-                 <?js= self.partial('details.tmpl', doc) ?>
-
-            <?js } else { ?>
-                <h3>Description</h3>
-                <?js if (doc.description) { ?>
-                    <p><?js= doc.description ?></p>
-                <?js } ?>
-            <?js
-                var classes = self.find({kind: 'class', memberof: doc.longname});
-                if (!isGlobalPage && classes && classes.length) {
-            ?>
-                <h3 id="#class">Classes</h3>
-                <?js classes.forEach(function(c) { ?>
-                    <p><?js= self.linkto(c.longname, c.name) ?></p>
-                <?js }); ?>
-            <?js } ?>
-
                 <?js= self.partial('details.tmpl', doc) ?>
 
                 <?js if (doc.examples && doc.examples.length) { ?>
                     <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
                     <?js= self.partial('examples.tmpl', doc.examples) ?>
+                <?js } ?>                
+            <?js } else { ?>
+                <h3>Description</h3>
+                <?js if (doc.description) { ?>
+                    <p><?js= doc.description ?></p>
                 <?js } ?>
+
+                <?js if (doc.examples && doc.examples.length) { ?>
+                    <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
+                    <?js= self.partial('examples.tmpl', doc.examples) ?>
+                <?js } ?>
+                <?js
+                    var classes = self.find({kind: 'class', memberof: doc.longname});
+                    if (!isGlobalPage && classes && classes.length) {
+                ?>
+                    <h3 id="#class">Classes</h3>
+                    <?js classes.forEach(function(c) { ?>
+                        <p><?js= self.linkto(c.longname, c.name) ?></p>
+                        <?js }); ?>
+                    <?js } ?>
+
+                    <?js= self.partial('details.tmpl', doc) ?>
             <?js } ?>
         </div>
 
diff --git a/tools/jsdoc/plugins/hifi.js b/tools/jsdoc/plugins/hifi.js
index 67dafe5a16..07549530ce 100644
--- a/tools/jsdoc/plugins/hifi.js
+++ b/tools/jsdoc/plugins/hifi.js
@@ -125,7 +125,7 @@ exports.handlers = {
             if (rows.length > 0) {
                 var availableIn = "<p class='availableIn'><b>Supported Script Types:</b> " + rows.join(" &bull; ") + "</p>";
              
-                e.doclet.description = (e.doclet.description ? e.doclet.description : "") + availableIn;
+                e.doclet.description = availableIn + (e.doclet.description ? e.doclet.description : "");
             }            
         }
 
diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index ee534ca24f..a5dd8d5236 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -93,7 +93,7 @@ if (WIN32)
     set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
 endif()
 
-link_hifi_libraries(entities-renderer)
+link_hifi_libraries(entities-renderer platform)
 
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
diff --git a/tools/nitpick/src/TestCreator.cpp b/tools/nitpick/src/TestCreator.cpp
index 693f6085d2..652292b9dc 100644
--- a/tools/nitpick/src/TestCreator.cpp
+++ b/tools/nitpick/src/TestCreator.cpp
@@ -323,9 +323,11 @@ void TestCreator::startTestsEvaluation(
 
             QString expectedImagePartialSourceDirectory = getExpectedImagePartialSourceDirectory(currentFilename);
 
-            // Images are stored on GitHub as ExpectedImage_ddddd.png
-            // Extract the digits at the end of the filename (excluding the file extension)
-            QString expectedImageFilenameTail = currentFilename.left(currentFilename.length() - 4).right(NUM_DIGITS);
+            // Images are stored on GitHub as ExpectedImage_ddddd.png or ExpectedImage_some_metadata_ddddd.png
+            // Extract the part of the filename after "ExpectedImage_" and excluding the file extension
+            QString expectedImageFilenameTail = currentFilename.left(currentFilename.lastIndexOf("."));
+            int expectedImageStart = expectedImageFilenameTail.lastIndexOf(".") + 1;
+            expectedImageFilenameTail.remove(0, expectedImageStart);
             QString expectedImageStoredFilename = EXPECTED_IMAGE_PREFIX + expectedImageFilenameTail + ".png";
 
             QString imageURLString("https://raw.githubusercontent.com/" + user + "/" + GIT_HUB_REPOSITORY  + "/" + branch + "/" +
@@ -495,6 +497,93 @@ void TestCreator::createTests(const QString& clientProfile) {
     QMessageBox::information(0, "Success", "Test images have been created");
 }
 
+namespace TestProfile {
+    std::vector<QString> tiers = [](){
+        std::vector<QString> toReturn;
+        for (int tier = (int)platform::Profiler::Tier::LOW; tier < (int)platform::Profiler::Tier::NumTiers; ++tier) {
+            QString tierStringUpper = platform::Profiler::TierNames[tier];
+            toReturn.push_back(tierStringUpper.toLower());
+        }
+        return toReturn;
+    }();
+
+    std::vector<QString> operatingSystems = { "windows", "mac", "linux", "android" };
+
+    std::vector<QString> gpus = { "amd", "nvidia", "intel" };
+};
+
+enum class ProfileCategory {
+    TIER,
+    OS,
+    GPU
+};
+const std::map<QString, ProfileCategory> propertyToProfileCategory = [](){
+    std::map<QString, ProfileCategory> toReturn;
+    for (const auto& tier : TestProfile::tiers) {
+        toReturn[tier] = ProfileCategory::TIER;
+    }
+    for (const auto& os : TestProfile::operatingSystems) {
+        toReturn[os] = ProfileCategory::OS;
+    }
+    for (const auto& gpu : TestProfile::gpus) {
+        toReturn[gpu] = ProfileCategory::GPU;
+    }
+    return toReturn;
+}();
+
+TestFilter::TestFilter(const QString& filterString) {
+    auto filterParts = filterString.split(".", QString::SkipEmptyParts);
+    for (const auto& filterPart : filterParts) {
+        QList<QString> allowedVariants = filterPart.split(",", QString::SkipEmptyParts);
+        if (allowedVariants.empty()) {
+            continue;
+        }
+
+        auto& referenceVariant = allowedVariants[0];
+        auto foundCategoryIt = propertyToProfileCategory.find(referenceVariant);
+        if (foundCategoryIt == propertyToProfileCategory.cend()) {
+            error = "Invalid test filter property '" + referenceVariant + "'";
+            return;
+        }
+
+        ProfileCategory selectedFilterCategory = foundCategoryIt->second;
+        for (auto allowedVariantIt = ++(allowedVariants.cbegin()); allowedVariantIt != allowedVariants.cend(); ++allowedVariantIt) {
+            auto& currentVariant = *allowedVariantIt;
+            auto nextCategoryIt = propertyToProfileCategory.find(currentVariant);
+            if (nextCategoryIt == propertyToProfileCategory.cend()) {
+                error = "Invalid test filter property '" + referenceVariant + "'";
+                return;
+            }
+            auto& currentCategory = nextCategoryIt->second;
+            if (currentCategory != selectedFilterCategory) {
+                error = "Mismatched comma-separated test filter properties '" + referenceVariant + "' and '" + currentVariant + "'";
+                return;
+            }
+            // List of comma-separated test property variants is consistent so far
+        }
+
+        switch (selectedFilterCategory) {
+        case ProfileCategory::TIER:
+            allowedTiers.insert(allowedTiers.cend(), allowedVariants.cbegin(), allowedVariants.cend());
+            break;
+        case ProfileCategory::OS:
+            allowedOperatingSystems.insert(allowedOperatingSystems.cend(), allowedVariants.cbegin(), allowedVariants.cend());
+            break;
+        case ProfileCategory::GPU:
+            allowedGPUs.insert(allowedGPUs.cend(), allowedVariants.cbegin(), allowedVariants.cend());
+            break;
+        }
+    }
+}
+
+bool TestFilter::isValid() const {
+    return error.isEmpty();
+}
+
+QString TestFilter::getError() const {
+    return error;
+}
+
 ExtractedText TestCreator::getTestScriptLines(QString testFileName) {
     ExtractedText relevantTextFromTest;
 
@@ -511,7 +600,7 @@ ExtractedText TestCreator::getTestScriptLines(QString testFileName) {
     QString line = stream.readLine();
 
     // Name of test is the string in the following line:
-    //        nitpick.perform("Apply Material Entities to Avatars", Script.resolvePath("."), function(testType) {...
+    //        nitpick.perform("Apply Material Entities to Avatars", Script.resolvePath("."), "secondary", undefined, function(testType) {...
     const QString ws("\\h*");    //white-space character
     const QString functionPerformName(ws + "nitpick" + ws + "\\." + ws + "perform");
     const QString quotedString("\\\".+\\\"");
@@ -644,6 +733,17 @@ void TestCreator::createAllMDFiles() {
     QMessageBox::information(0, "Success", "MD files have been created");
 }
 
+QString joinVector(const std::vector<QString>& qStringVector, const char* separator) {
+    if (qStringVector.empty()) {
+        return QString("");
+    }
+    QString joined = qStringVector[0];
+    for (std::size_t i = 1; i < qStringVector.size(); ++i) {
+        joined += separator + qStringVector[i];
+    }
+    return joined;
+}
+
 bool TestCreator::createMDFile(const QString& directory) {
     // Verify folder contains test.js file
     QString testFileName(directory + "/" + TEST_FILENAME);
@@ -655,33 +755,73 @@ bool TestCreator::createMDFile(const QString& directory) {
 
     ExtractedText testScriptLines = getTestScriptLines(testFileName);
 
+    QDir qDirectory(directory);
+
     QString mdFilename(directory + "/" + "test.md");
     QFile mdFile(mdFilename);
     if (!mdFile.open(QIODevice::WriteOnly)) {
         QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), "Failed to create file " + mdFilename);
+        // TODO: Don't just exit
         exit(-1);
     }
 
     QTextStream stream(&mdFile);
 
-    //TestCreator title
     QString testName = testScriptLines.title;
     stream << "# " << testName << "\n";
 
     stream << "## Run this script URL: [Manual](./test.js?raw=true)   [Auto](./testAuto.js?raw=true)(from menu/Edit/Open and Run scripts from URL...)."  << "\n\n";
 
     stream << "## Preconditions" << "\n";
-    stream << "- In an empty region of a domain with editing rights." << "\n\n";
+    stream << "- In an empty region of a domain with editing rights." << "\n";
+    stream << "\n";
+
+    // ExpectedImage_00000.png OR ExpectedImage_some_stu-ff_00000.png
+    const QRegularExpression firstExpectedImage("^ExpectedImage(_[-_\\w]*)?_00000\\.png$");
+    std::vector<QString> testDescriptors;
+    std::vector<TestFilter> testFilters;
+
+    for (const auto& potentialImageFile : qDirectory.entryInfoList()) {
+        if (potentialImageFile.isDir()) {
+            continue;
+        }
+
+        auto firstExpectedImageMatch = firstExpectedImage.match(potentialImageFile.fileName());
+        if (!firstExpectedImageMatch.hasMatch()) {
+            continue;
+        }
+
+        QString testDescriptor = firstExpectedImageMatch.captured(1);
+        auto filterString = QString(testDescriptor).replace("_", ".").replace("-", ",");
+        TestFilter descriptorAsFilter(filterString);
+
+        testDescriptors.push_back(testDescriptor);
+        testFilters.push_back(descriptorAsFilter);
+    }
 
     stream << "## Steps\n";
     stream << "Press '" + ADVANCE_KEY + "' key to advance step by step\n\n"; // note apostrophes surrounding 'ADVANCE_KEY'
-
     int snapShotIndex { 0 };
     for (size_t i = 0; i < testScriptLines.stepList.size(); ++i) {
         stream << "### Step " << QString::number(i + 1) << "\n";
         stream << "- " << testScriptLines.stepList[i]->text << "\n";
         if ((i + 1 < testScriptLines.stepList.size()) && testScriptLines.stepList[i]->takeSnapshot) {
-            stream << "- ![](./ExpectedImage_" << QString::number(snapShotIndex).rightJustified(5, '0') << ".png)\n";
+            for (int i = 0; i < (int)testDescriptors.size(); ++i) {
+                const auto& testDescriptor = testDescriptors[i];
+                const auto& descriptorAsFilter = testFilters[i];
+                if (descriptorAsFilter.isValid()) {
+                    stream << "- Expected image on ";
+                    stream << (descriptorAsFilter.allowedTiers.empty() ? "any" : joinVector(descriptorAsFilter.allowedTiers, "/")) << " tier, ";
+                    stream << (descriptorAsFilter.allowedOperatingSystems.empty() ? "any" : joinVector(descriptorAsFilter.allowedOperatingSystems, "/")) << " OS, ";
+                    stream << (descriptorAsFilter.allowedGPUs.empty() ? "any" : joinVector(descriptorAsFilter.allowedGPUs, "/")) << " GPU";
+                    stream << ":";
+                } else {
+                    // Fall back to displaying file name
+                    stream << "- ExpectedImage" << testDescriptor << "_" << QString::number(snapShotIndex).rightJustified(5, '0') << ".png";
+                }
+                stream << "\n";
+                stream << "- ![](./ExpectedImage" << testDescriptor << "_" << QString::number(snapShotIndex).rightJustified(5, '0') << ".png)\n";
+            }
             ++snapShotIndex;
         }
     }
diff --git a/tools/nitpick/src/TestCreator.h b/tools/nitpick/src/TestCreator.h
index f995c06c94..247f2ee117 100644
--- a/tools/nitpick/src/TestCreator.h
+++ b/tools/nitpick/src/TestCreator.h
@@ -16,6 +16,8 @@
 #include <QtCore/QRegularExpression>
 #include <QProgressBar>
 
+#include <platform/Profiler.h>
+
 #include "AWSInterface.h"
 #include "ImageComparer.h"
 #include "Downloader.h"
@@ -30,6 +32,20 @@ public:
 
 using StepList = std::vector<Step*>;
 
+class TestFilter {
+public:
+    TestFilter(const QString& filterString);
+    bool isValid() const;
+    QString getError() const;
+
+    std::vector<QString> allowedTiers;
+    std::vector<QString> allowedOperatingSystems;
+    std::vector<QString> allowedGPUs;
+
+protected:
+    QString error;
+};
+
 class ExtractedText {
 public:
     QString title;
diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index c52803956c..0853b41872 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -445,7 +445,7 @@ void DomainBaker::handleFinishedModelBaker() {
 
             // enumerate the QJsonRef values for the URL of this model from our multi hash of
             // entity objects needing a URL re-write
-            for (auto propertyEntityPair : _entitiesNeedingRewrite.values(baker->getModelURL())) {
+            for (auto propertyEntityPair : _entitiesNeedingRewrite.values(baker->getOriginalInputModelURL())) {
                 QString property = propertyEntityPair.first;
                 // convert the entity QJsonValueRef to a QJsonObject so we can modify its URL
                 auto entity = propertyEntityPair.second.toObject();
@@ -485,10 +485,10 @@ void DomainBaker::handleFinishedModelBaker() {
         }
 
         // remove the baked URL from the multi hash of entities needing a re-write
-        _entitiesNeedingRewrite.remove(baker->getModelURL());
+        _entitiesNeedingRewrite.remove(baker->getOriginalInputModelURL());
 
         // drop our shared pointer to this baker so that it gets cleaned up
-        _modelBakers.remove(baker->getModelURL());
+        _modelBakers.remove(baker->getOriginalInputModelURL());
 
         // emit progress to tell listeners how many models we have baked
         emit bakeProgress(++_completedSubBakes, _totalNumberOfSubBakes);
diff --git a/unpublishedScripts/marketplace/blocks/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js
index 813a77c74a..9c10ba8197 100644
--- a/unpublishedScripts/marketplace/blocks/blocksApp.js
+++ b/unpublishedScripts/marketplace/blocks/blocksApp.js
@@ -35,7 +35,7 @@
 
 	function onClicked() {
 	    if (!shown) {
-	        tablet.gotoWebScreen(APP_URL, "", true);
+	        tablet.gotoWebScreen(APP_URL, "");
 	    } else {
 	        tablet.gotoHomeScreen();
 	    }